* Throw a showstopper exception when a hook function fails to return a value.
Forgetting to give a 'true' return value is a very common error which tends
to cause hard-to-track-down interactions between extensions.
+* (bug 9415) Added options to Special:Protect to allow setting of per-page robot
+ policies. This can be done only by users with the 'editrobots' permission
== Bugfixes since 1.10 ==
} elseif( isset( $wgNamespaceRobotPolicies[$ns] ) ) {
# Honour customised robot policies for this namespace
$policy = $wgNamespaceRobotPolicies[$ns];
+ } elseif ( $this->mTitle->getRestrictions( 'robots' ) ) {
+ $policy = implode( ',', $this->mTitle->getRestrictions( 'robots' ) );
} else {
# Default to encourage indexing and following links
$policy = 'index,follow';
$current = array();
foreach( $wgRestrictionTypes as $action )
$current[$action] = implode( '', $this->mTitle->getRestrictions( $action ) );
+ $current['robots'] = implode( '', $this->mTitle->getRestrictions( 'robots' ) );
$current = Article::flattenRestrictions( $current );
$updated = Article::flattenRestrictions( $limit );
foreach( $limit as $action => $restrictions ) {
# Check if the group level required to edit also can protect pages
# Otherwise, people who cannot normally protect can "protect" pages via transclusion
- $cascade = ( $cascade && isset($wgGroupPermissions[$restrictions]['protect']) && $wgGroupPermissions[$restrictions]['protect'] );
+ if ( in_array( $restrictions, $wgRestrictionTypes ) ) {
+ $cascade = ( $cascade && isset($wgGroupPermissions[$restrictions]['protect']) && $wgGroupPermissions[$restrictions]['protect'] );
+ }
}
$cascade_description = '';
$wgGroupPermissions['sysop']['upload_by_url'] = true;
$wgGroupPermissions['sysop']['ipblock-exempt'] = true;
$wgGroupPermissions['sysop']['blockemail'] = true;
+$wgGroupPermissions['sysop']['editrobots'] = true;
// Permission to change users' group assignments
$wgGroupPermissions['bureaucrat']['userrights'] = true;
// but the db allows multiples separated by commas.
$this->mRestrictions[$action] = implode( '', $this->mTitle->getRestrictions( $action ) );
}
+ $this->mRestrictions['robots'] = implode( ',', $this->mTitle->getRestrictions( 'robots' ) );
$this->mCascade = $this->mTitle->areRestrictionsCascading();
$this->mRestrictions[$action] = $val;
}
}
+
+ // Read checkboxex only if user is allowed to change robots policy, otherwise keep previous policy
+ if ( $wgUser->isAllowed( 'editrobots' ) ) {
+ $robotspolicy = $wgRequest->getBool( 'mwProtect-robots-noindex' ) ? 'noindex' : 'index';
+ $robotspolicy .= $wgRequest->getBool( 'mwProtect-robots-nofollow' ) ? ',nofollow' : ',follow';
+ // 'index,follow' is default, no need to set this explicitly at this point; is done at Article::View
+ $this->mRestrictions['robots'] = ( $robotspolicy == 'index,follow' ) ? '' : $robotspolicy;
+ }
}
}
-
+
function execute() {
global $wgRequest;
if( $wgRequest->wasPosted() ) {
}
function buildForm() {
- global $wgUser;
+ global $wgUser, $wgRestrictionTypes;
$out = '';
if( !$this->disabled ) {
$out .= "<tr>\n";
foreach( $this->mRestrictions as $action => $required ) {
/* Not all languages have V_x <-> N_x relation */
- $out .= "<th>" . wfMsgHtml( 'restriction-' . $action ) . "</th>\n";
+ if ( in_array( $action, $wgRestrictionTypes ) )
+ $out .= "<th>" . wfMsgHtml( 'restriction-' . $action ) . "</th>\n";
}
$out .= "</tr>\n";
$out .= "<tr>\n";
foreach( $this->mRestrictions as $action => $selected ) {
- $out .= "<td>\n";
- $out .= $this->buildSelector( $action, $selected );
- $out .= "</td>\n";
+ if ( in_array( $action, $wgRestrictionTypes ) ) {
+ $out .= "<td>\n";
+ $out .= $this->buildSelector( $action, $selected );
+ $out .= "</td>\n";
+ }
}
$out .= "</tr>\n";
if( !$this->disabled )
$out .= '<tr><td></td><td>' . $this->buildWatchInput() . "</td></tr>\n";
+ $out .= $this->buildRobotsInput();
$out .= $this->buildExpiryInput();
if( !$this->disabled ) {
return $ci;
}
+ function buildRobotsInput() {
+ global $wgUser;
+ $robotsallowed = $wgUser->isAllowed( 'editrobots' ) ? array() : array( 'disabled' => 'disabled' );
+ $noindexset = ( isset( $this->mRestrictions['robots'] ) && strstr( $this->mRestrictions['robots'], 'noindex' ) ) ? true : false;
+ $nofollowset = ( isset( $this->mRestrictions['robots'] ) && strstr( $this->mRestrictions['robots'], 'nofollow' ) ) ? true : false;
+ $ret = "<tr><td align=\"right\">";
+ $ret .= Xml::label( wfMsg( 'protect-robotspolicy' ), 'mwProtect-robots-label' );
+ $ret .= "</td> <td align=\"left\" width=\"60\">";
+ $ret .= Xml::checkLabel( 'noindex', 'mwProtect-robots-noindex', 'mwProtect-robots-noindex', $noindexset, $robotsallowed );
+ $ret .= Xml::checkLabel( 'nofollow', 'mwProtect-robots-nofollow', 'mwProtect-robots-nofollow', $nofollowset, $robotsallowed );
+ $ret .= "</td></tr>";
+ return $ret;
+ }
+
function buildExpiryInput() {
$attribs = array( 'id' => 'expires' ) + $this->disabledAttrib;
return '<tr>'
if( $this->getNamespace() == NS_SPECIAL )
return true;
+ if ( $this->getRestrictions( 'robots' ) && $this->getRestrictions( 'robots' ) != '' )
+ return true;
+
# Check regular protection levels
if( $action == 'edit' || $action == '' ) {
$r = $this->getRestrictions( 'edit' );
'protect-summary-cascade' => 'kaskadierend',
'protect-expiring' => 'bis $1 (UTC)',
'protect-cascade' => 'Kaskadierende Sperre – alle in diese Seite eingebundenen Vorlagen werden ebenfalls gesperrt.',
+'protect-robotspolicy' => 'Anweisung für Suchroboter:',
'restriction-type' => 'Schutzstatus',
'restriction-level' => 'Schutzhöhe',
'minimum-size' => 'Mindestgröße:',
'protect-summary-cascade' => 'cascading',
'protect-expiring' => 'expires $1 (UTC)',
'protect-cascade' => 'Protect pages included in this page (cascading protection)',
+'protect-robotspolicy' => 'Robot policy:',
'restriction-type' => 'Permission:',
'restriction-level' => 'Restriction level:',
'minimum-size' => 'Min size',
'protect-summary-cascade',
'protect-expiring',
'protect-cascade',
+ 'protect-robotspolicy',
'restriction-type',
'restriction-level',
'minimum-size',