X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FProtectionForm.php;h=102c2976972171146905e132e712fe979f3f0bc1;hb=7a605cce46eb688dfb697487a1b1d300bef4361c;hp=222851c190ebd122e6679143481d118ca7f44dd0;hpb=0512db6bc31b3e26a50b82a6cf06c300272fc9dc;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/ProtectionForm.php b/includes/ProtectionForm.php index 222851c190..102c297697 100644 --- a/includes/ProtectionForm.php +++ b/includes/ProtectionForm.php @@ -20,16 +20,39 @@ */ /** - * @todo document, briefly. + * Handles the page protection UI and backend */ class ProtectionForm { + /** A map of action to restriction level, from request or default */ var $mRestrictions = array(); + + /** The custom/additional protection reason */ var $mReason = ''; + + /** The reason selected from the list, blank for other/additional */ + var $mReasonSelection = ''; + + /** True if the restrictions are cascading, from request or existing protection */ var $mCascade = false; - var $mExpiry = null; + + /** 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. + */ + var $mExpirySelection = array(); + + /** Permissions errors for the protect action */ var $mPermErrors = array(); + + /** Types (i.e. actions) for which levels can be selected */ var $mApplicableTypes = array(); + /** Map of action to the expiry time of the existing protection */ + var $mExistingExpiry = array(); + function __construct( Article $article ) { global $wgRequest, $wgUser; global $wgRestrictionTypes, $wgRestrictionLevels; @@ -37,44 +60,57 @@ class ProtectionForm { $this->mTitle = $article->mTitle; $this->mApplicableTypes = $this->mTitle->exists() ? $wgRestrictionTypes : array('create'); - if( $this->mTitle ) { - $this->mTitle->loadRestrictions(); - - foreach( $this->mApplicableTypes as $action ) { - // Fixme: this form currently requires individual selections, - // but the db allows multiples separated by commas. - $this->mRestrictions[$action] = implode( '', $this->mTitle->getRestrictions( $action ) ); - } - - $this->mCascade = $this->mTitle->areRestrictionsCascading(); - - if ( $this->mTitle->mRestrictionsExpiry == 'infinity' ) { - $this->mExpiry = 'infinite'; - } else if ( strlen($this->mTitle->mRestrictionsExpiry) == 0 ) { - $this->mExpiry = ''; - } else { - // FIXME: this format is not user friendly - $this->mExpiry = wfTimestamp( TS_ISO_8601, $this->mTitle->mRestrictionsExpiry ); - } - } + $this->mCascade = $this->mTitle->areRestrictionsCascading(); // The form will be available in read-only to show levels. - $this->disabled = wfReadOnly() || ($this->mPermErrors = $this->mTitle->getUserPermissionsErrors('protect',$wgUser)) != array(); + $this->mPermErrors = $this->mTitle->getUserPermissionsErrors('protect',$wgUser); + $this->disabled = wfReadOnly() || $this->mPermErrors != array(); $this->disabledAttrib = $this->disabled ? array( 'disabled' => 'disabled' ) : array(); $this->mReason = $wgRequest->getText( 'mwProtect-reason' ); - $this->mReasonList = $wgRequest->getText( 'wpProtectReasonList' ); + $this->mReasonSelection = $wgRequest->getText( 'wpProtectReasonSelection' ); $this->mCascade = $wgRequest->getBool( 'mwProtect-cascade', $this->mCascade ); - // Let dropdown have 'infinite' for unprotected pages - if( !($expiry = $wgRequest->getText( 'mwProtect-expiry' )) && $this->mExpiry != 'infinite' ) { - $expiry = $this->mExpiry; - } - $this->mExpiry = $expiry; - $this->mExpiryList = $wgRequest->getText( 'wpProtectExpiryList', $this->mExpiry ? '' : 'infinite' ); foreach( $this->mApplicableTypes as $action ) { + // Fixme: this form currently requires individual selections, + // but the db allows multiples separated by commas. + $this->mRestrictions[$action] = implode( '', $this->mTitle->getRestrictions( $action ) ); + + if ( !$this->mRestrictions[$action] ) { + // No existing expiry + $existingExpiry = ''; + } else { + $existingExpiry = $this->mTitle->getRestrictionExpiry( $action ); + } + $this->mExistingExpiry[$action] = $existingExpiry; + + $requestExpiry = $wgRequest->getText( "mwProtect-expiry-$action" ); + $requestExpirySelection = $wgRequest->getVal( "wpProtectExpirySelection-$action" ); + + if ( $requestExpiry ) { + // Custom expiry takes precedence + $this->mExpiry[$action] = $requestExpiry; + $this->mExpirySelection[$action] = 'othertime'; + } elseif ( $requestExpirySelection ) { + // Expiry selected from list + $this->mExpiry[$action] = ''; + $this->mExpirySelection[$action] = $requestExpirySelection; + } elseif ( $existingExpiry == 'infinity' ) { + // Existing expiry is infinite, use "infinite" in drop-down + $this->mExpiry[$action] = ''; + $this->mExpirySelection[$action] = 'infinite'; + } elseif ( $existingExpiry ) { + // Use existing expiry in its own list item + $this->mExpiry[$action] = ''; + $this->mExpirySelection[$action] = $existingExpiry; + } else { + // Final default: infinite + $this->mExpiry[$action] = ''; + $this->mExpirySelection[$action] = 'infinite'; + } + $val = $wgRequest->getVal( "mwProtect-level-$action" ); if( isset( $val ) && in_array( $val, $wgRestrictionLevels ) ) { // Prevent users from setting levels that they cannot later unset @@ -91,6 +127,34 @@ 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 + */ + function getExpiry( $action ) { + if ( $this->mExpirySelection[$action] == 'existing' ) { + return $this->mExistingExpiry[$action]; + } elseif ( $this->mExpirySelection[$action] == 'othertime' ) { + $value = $this->mExpiry[$action]; + } else { + $value = $this->mExpirySelection[$action]; + } + if ( $value == 'infinite' || $value == 'indefinite' || $value == 'infinity' ) { + $time = Block::infinity(); + } else { + $unix = strtotime( $value ); + + if ( !$unix || $unix === -1 ) { + return false; + } + + // Fixme: non-qualified absolute times are not in users specified timezone + // and there isn't notice about it in the ui + $time = wfTimestamp( TS_MW, $unix ); + } + return $time; + } + function execute() { global $wgRequest, $wgOut; if( $wgRequest->wasPosted() ) { @@ -154,7 +218,7 @@ class ProtectionForm { } function save() { - global $wgRequest, $wgUser, $wgOut; + global $wgRequest, $wgUser; # Permission check! if ( $this->disabled ) { $this->show(); @@ -168,34 +232,23 @@ class ProtectionForm { } # Create reason string. Use list and/or custom string. - $reasonstr = $this->mReasonList; + $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; } - # Custom expiry takes precedence - if ( strlen( $this->mExpiry ) == 0 ) { - $this->mExpiry = strlen($this->mExpiryList) ? $this->mExpiryList : 'infinite'; - } - - if ( $this->mExpiry == 'infinite' || $this->mExpiry == 'indefinite' ) { - $expiry = Block::infinity(); - } else { - # Convert GNU-style date, on error returns -1 for PHP <5.1 and false for PHP >=5.1 - $expiry = strtotime( $this->mExpiry ); - - if ( $expiry < 0 || $expiry === false ) { + $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; } - - // Fixme: non-qualified absolute times are not in users specified timezone - // and there isn't notice about it in the ui - $expiry = wfTimestamp( TS_MW, $expiry ); - - if ( $expiry < wfTimestampNow() ) { + if ( $expiry[$action] < wfTimestampNow() ) { $this->show( wfMsg( 'protect_expiry_old' ) ); return false; } @@ -206,7 +259,7 @@ class ProtectionForm { global $wgGroupPermissions; $edit_restriction = $this->mRestrictions['edit']; - + $this->mCascade = $wgRequest->getBool( 'mwProtect-cascade' ); if ($this->mCascade && ($edit_restriction != 'protect') && !(isset($wgGroupPermissions[$edit_restriction]['protect']) && $wgGroupPermissions[$edit_restriction]['protect'] ) ) $this->mCascade = false; @@ -214,7 +267,7 @@ class ProtectionForm { if ($this->mTitle->exists()) { $ok = $this->mArticle->updateRestrictions( $this->mRestrictions, $reasonstr, $this->mCascade, $expiry ); } else { - $ok = $this->mTitle->updateTitleProtection( $this->mRestrictions['create'], $reasonstr, $expiry ); + $ok = $this->mTitle->updateTitleProtection( $this->mRestrictions['create'], $reasonstr, $expiry['create'] ); } if( !$ok ) { @@ -226,7 +279,6 @@ class ProtectionForm { } elseif( $this->mTitle->userIsWatching() ) { $this->mArticle->doUnwatch(); } - return $ok; } @@ -236,76 +288,114 @@ class ProtectionForm { * @return $out string HTML form */ function buildForm() { - global $wgUser; + global $wgUser, $wgLang; - $mProtectexpiry = Xml::label( wfMsg( 'protectexpiry' ), 'mwProtectExpiryList' ); - $mProtectother = Xml::label( wfMsg( 'protect-othertime' ), 'expires' ); - $mProtectreasonother = Xml::label( wfMsg( 'protectcomment' ), 'wpProtectReasonList' ); + $mProtectreasonother = Xml::label( wfMsg( 'protectcomment' ), 'wpProtectReasonSelection' ); $mProtectreason = Xml::label( wfMsg( 'protect-otherreason' ), 'mwProtect-reason' ); $out = ''; if( !$this->disabled ) { $out .= $this->buildScript(); - // The submission needs to reenable the move permission selector - // if it's in locked mode, or some browsers won't submit the data. $out .= Xml::openElement( 'form', array( 'method' => 'post', 'action' => $this->mTitle->getLocalUrl( 'action=protect' ), - 'id' => 'mw-Protect-Form', 'onsubmit' => 'protectEnable(true)' ) ); + 'id' => 'mw-Protect-Form', 'onsubmit' => 'ProtectionForm.enableUnchainedInputs(true)' ) ); $out .= Xml::hidden( 'wpEditToken',$wgUser->editToken() ); } $out .= Xml::openElement( 'fieldset' ) . Xml::element( 'legend', null, wfMsg( 'protect-legend' ) ) . Xml::openElement( 'table', array( 'id' => 'mwProtectSet' ) ) . - Xml::openElement( 'tbody' ) . - "
+ {$mProtectexpiry} + | +" . + Xml::tags( 'select', + array( + 'id' => "mwProtectExpirySelection-$action", + 'name' => "wpProtectExpirySelection-$action", + 'onchange' => "ProtectionForm.updateExpiryList(this)", + 'tabindex' => '2' ) + $this->disabledAttrib, + $expiryFormOptions ) . + " | +
" . + $mProtectother . + ' | +' . + Xml::input( "mwProtect-expiry-$action", 50, $this->mExpiry[$action], $attribs ) . + ' | +
' . $link . '
'; + } if ( !$this->disabled ) { $out .= Xml::closeElement( 'form' ) . @@ -412,7 +482,7 @@ class ProtectionForm { 'id' => $id, 'name' => $id, 'size' => count( $levels ), - 'onchange' => 'protectLevelsUpdate(this)', + 'onchange' => 'ProtectionForm.updateLevels(this)', ) + $this->disabledAttrib; $out = Xml::openElement( 'select', $attribs ); @@ -445,7 +515,7 @@ class ProtectionForm { global $wgStylePath, $wgStyleVersion; return Xml::tags( 'script', array( 'type' => 'text/javascript', - 'src' => $wgStylePath . "/common/protect.js?$wgStyleVersion" ), '' ); + 'src' => $wgStylePath . "/common/protect.js?$wgStyleVersion.1" ), '' ); } function buildCleanupScript() { @@ -458,7 +528,15 @@ class ProtectionForm { } } $script .= "[" . implode(',',$CascadeableLevels) . "];\n"; - $script .= 'protectInitialize("mwProtectSet","' . Xml::escapeJsString( wfMsg( 'protect-unchain' ) ) . '","' . count($this->mApplicableTypes) . '")'; + $options = (object)array( + 'tableId' => 'mw-protect-table-move', + 'labelText' => wfMsg( 'protect-unchain' ), + 'numTypes' => count($this->mApplicableTypes), + 'existingMatch' => 1 == count( array_unique( $this->mExistingExpiry ) ), + ); + $encOptions = Xml::encodeJsVar( $options ); + + $script .= "ProtectionForm.init($encOptions)"; return Xml::tags( 'script', array( 'type' => 'text/javascript' ), $script ); }