summaryrefslogtreecommitdiff
path: root/includes/ProtectionForm.php
diff options
context:
space:
mode:
authorPierre Schmitz <pierre@archlinux.de>2012-05-03 13:01:35 +0200
committerPierre Schmitz <pierre@archlinux.de>2012-05-03 13:01:35 +0200
commitd9022f63880ce039446fba8364f68e656b7bf4cb (patch)
tree16b40fbf17bf7c9ee6f4ead25b16dd192378050a /includes/ProtectionForm.php
parent27cf83d177256813e2e802241085fce5dd0f3fb9 (diff)
Update to MediaWiki 1.19.0
Diffstat (limited to 'includes/ProtectionForm.php')
-rw-r--r--includes/ProtectionForm.php93
1 files changed, 46 insertions, 47 deletions
diff --git a/includes/ProtectionForm.php b/includes/ProtectionForm.php
index 71703eb2..dbe06d49 100644
--- a/includes/ProtectionForm.php
+++ b/includes/ProtectionForm.php
@@ -66,8 +66,11 @@ class ProtectionForm {
// Check if the form should be disabled.
// If it is, the form will be available in read-only to show levels.
- $this->mPermErrors = $this->mTitle->getUserPermissionsErrors('protect',$wgUser);
- $this->disabled = wfReadOnly() || $this->mPermErrors != array();
+ $this->mPermErrors = $this->mTitle->getUserPermissionsErrors( 'protect', $wgUser );
+ if ( wfReadOnly() ) {
+ $this->mPermErrors[] = array( 'readonlytext', wfReadOnlyReason() );
+ }
+ $this->disabled = $this->mPermErrors != array();
$this->disabledAttrib = $this->disabled
? array( 'disabled' => 'disabled' )
: array();
@@ -180,6 +183,11 @@ class ProtectionForm {
*/
function execute() {
global $wgRequest, $wgOut;
+
+ if ( $this->mTitle->getNamespace() == NS_MEDIAWIKI ) {
+ throw new ErrorPageError( 'protect-badnamespace-title', 'protect-badnamespace-text' );
+ }
+
if( $wgRequest->wasPosted() ) {
if( $this->save() ) {
$q = $this->mArticle->isRedirect() ? 'redirect=no' : '';
@@ -196,23 +204,17 @@ class ProtectionForm {
* @param $err String: error message or null if there's no error
*/
function show( $err = null ) {
- global $wgOut, $wgUser;
+ global $wgOut;
$wgOut->setRobotPolicy( 'noindex,nofollow' );
- if( is_null( $this->mTitle ) ||
- $this->mTitle->getNamespace() == NS_MEDIAWIKI ) {
- $wgOut->showFatalError( wfMsg( 'badarticleerror' ) );
- return;
- }
-
- list( $cascadeSources, /* $restrictions */ ) = $this->mTitle->getCascadeProtectionSources();
-
- if ( $err != "" ) {
- $wgOut->setSubtitle( wfMsgHtml( 'formerror' ) );
+ if ( is_array( $err ) ) {
+ $wgOut->wrapWikiMsg( "<p class='error'>\n$1\n</p>\n", $err );
+ } elseif ( is_string( $err ) ) {
$wgOut->addHTML( "<p class='error'>{$err}</p>\n" );
}
+ list( $cascadeSources, /* $restrictions */ ) = $this->mTitle->getCascadeProtectionSources();
if ( $cascadeSources && count($cascadeSources) > 0 ) {
$titles = '';
@@ -223,26 +225,19 @@ class ProtectionForm {
$wgOut->wrapWikiMsg( "<div id=\"mw-protect-cascadeon\">\n$1\n" . $titles . "</div>", array( 'protect-cascadeon', count($cascadeSources) ) );
}
- $sk = $wgUser->getSkin();
- $titleLink = $sk->link( $this->mTitle );
- $wgOut->setPageTitle( wfMsg( 'protect-title', $this->mTitle->getPrefixedText() ) );
- $wgOut->setSubtitle( wfMsg( 'protect-backlink', $titleLink ) );
-
# Show an appropriate message if the user isn't allowed or able to change
# the protection settings at this time
- if( $this->disabled ) {
- if( wfReadOnly() ) {
- $wgOut->readOnlyPage();
- } elseif( $this->mPermErrors ) {
- $wgOut->showPermissionsErrorPage( $this->mPermErrors );
- }
+ if ( $this->disabled ) {
+ $wgOut->setPageTitle( wfMessage( 'protect-title-notallowed', $this->mTitle->getPrefixedText() ) );
+ $wgOut->addWikiText( $wgOut->formatPermissionsErrorMessage( $this->mPermErrors, 'protect' ) );
} else {
+ $wgOut->setPageTitle( wfMessage( 'protect-title', $this->mTitle->getPrefixedText() ) );
$wgOut->addWikiMsg( 'protect-text',
wfEscapeWikiText( $this->mTitle->getPrefixedText() ) );
}
+ $wgOut->addBacklinkSubtitle( $this->mTitle );
$wgOut->addHTML( $this->buildForm() );
-
$this->showLogExtract( $wgOut );
}
@@ -252,7 +247,7 @@ class ProtectionForm {
* @return Boolean: success
*/
function save() {
- global $wgRequest, $wgUser;
+ global $wgRequest, $wgUser, $wgOut;
# Permission check!
if ( $this->disabled ) {
@@ -261,8 +256,8 @@ class ProtectionForm {
}
$token = $wgRequest->getVal( 'wpEditToken' );
- if ( !$wgUser->matchEditToken( $token ) ) {
- $this->show( wfMsg( 'sessionfailure' ) );
+ if ( !$wgUser->matchEditToken( $token, array( 'protect', $this->mTitle->getPrefixedDBkey() ) ) ) {
+ $this->show( array( 'sessionfailure' ) );
return false;
}
@@ -280,11 +275,11 @@ class ProtectionForm {
if( empty($this->mRestrictions[$action]) )
continue; // unprotected
if ( !$expiry[$action] ) {
- $this->show( wfMsg( 'protect_expiry_invalid' ) );
+ $this->show( array( 'protect_expiry_invalid' ) );
return false;
}
if ( $expiry[$action] < wfTimestampNow() ) {
- $this->show( wfMsg( 'protect_expiry_old' ) );
+ $this->show( array( 'protect_expiry_old' ) );
return false;
}
}
@@ -299,20 +294,24 @@ class ProtectionForm {
!(isset($wgGroupPermissions[$edit_restriction]['protect']) && $wgGroupPermissions[$edit_restriction]['protect'] ) )
$this->mCascade = false;
- if ($this->mTitle->exists()) {
- $ok = $this->mArticle->updateRestrictions( $this->mRestrictions, $reasonstr, $this->mCascade, $expiry );
- } else {
- $ok = $this->mTitle->updateTitleProtection( $this->mRestrictions['create'], $reasonstr, $expiry['create'] );
- }
+ $status = $this->mArticle->doUpdateRestrictions( $this->mRestrictions, $expiry, $this->mCascade, $reasonstr, $wgUser );
- if( !$ok ) {
- throw new FatalError( "Unknown error at restriction save time." );
+ if ( !$status->isOK() ) {
+ $this->show( $wgOut->parseInline( $status->getWikiText() ) );
+ return false;
}
+ /**
+ * Give extensions a change to handle added form items
+ *
+ * @since 1.19 you can (and you should) return false to abort saving;
+ * you can also return an array of message name and its parameters
+ */
$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( !wfRunHooks( 'ProtectionForm::save', array( $this->mArticle, &$errorMsg ) ) ) {
+ if ( $errorMsg == '' ) {
+ $errorMsg = array( 'hookaborted' );
+ }
}
if( $errorMsg != '' ) {
$this->show( $errorMsg );
@@ -324,7 +323,7 @@ class ProtectionForm {
} elseif ( $this->mTitle->userIsWatching() ) {
WatchAction::doUnwatch( $this->mTitle, $wgUser );
}
- return $ok;
+ return true;
}
/**
@@ -344,7 +343,6 @@ class ProtectionForm {
$out .= Xml::openElement( 'form', array( 'method' => 'post',
'action' => $this->mTitle->getLocalUrl( 'action=protect' ),
'id' => 'mw-Protect-Form', 'onsubmit' => 'ProtectionForm.enableUnchainedInputs(true)' ) );
- $out .= Html::hidden( 'wpEditToken',$wgUser->editToken() );
}
$out .= Xml::openElement( 'fieldset' ) .
@@ -375,9 +373,9 @@ class ProtectionForm {
$expiryFormOptions = '';
if ( $this->mExistingExpiry[$action] && $this->mExistingExpiry[$action] != 'infinity' ) {
- $timestamp = $wgLang->timeanddate( $this->mExistingExpiry[$action] );
- $d = $wgLang->date( $this->mExistingExpiry[$action] );
- $t = $wgLang->time( $this->mExistingExpiry[$action] );
+ $timestamp = $wgLang->timeanddate( $this->mExistingExpiry[$action], true );
+ $d = $wgLang->date( $this->mExistingExpiry[$action], true );
+ $t = $wgLang->time( $this->mExistingExpiry[$action], true );
$expiryFormOptions .=
Xml::option(
wfMsg( 'protect-existing-expiry', $timestamp, $d, $t ),
@@ -501,7 +499,7 @@ class ProtectionForm {
if ( $wgUser->isAllowed( 'editinterface' ) ) {
$title = Title::makeTitle( NS_MEDIAWIKI, 'Protect-dropdown' );
- $link = $wgUser->getSkin()->link(
+ $link = Linker::link(
$title,
wfMsgHtml( 'protect-edit-reasonlist' ),
array(),
@@ -511,6 +509,7 @@ class ProtectionForm {
}
if ( !$this->disabled ) {
+ $out .= Html::hidden( 'wpEditToken', $wgUser->getEditToken( array( 'protect', $this->mTitle->getPrefixedDBkey() ) ) );
$out .= Xml::closeElement( 'form' );
$wgOut->addScript( $this->buildCleanupScript() );
}
@@ -608,7 +607,7 @@ class ProtectionForm {
function showLogExtract( &$out ) {
# Show relevant lines from the protection log:
$out->addHTML( Xml::element( 'h2', null, LogPage::logName( 'protect' ) ) );
- LogEventsList::showLogExtract( $out, 'protect', $this->mTitle->getPrefixedText() );
+ LogEventsList::showLogExtract( $out, 'protect', $this->mTitle );
# Let extensions add other relevant log extracts
wfRunHooks( 'ProtectionForm::showLogExtract', array($this->mArticle,$out) );
}