$this->BlockAddress = $wgRequest->getVal( 'wpBlockAddress', $wgRequest->getVal( 'ip', $par ) );
$this->BlockAddress = strtr( $this->BlockAddress, '_', ' ' );
$this->BlockReason = $wgRequest->getText( 'wpBlockReason' );
- $this->BlockReasonList = $wgRequest->getText( 'wpBlockReasonList' );
$this->BlockExpiry = $wgRequest->getVal( 'wpBlockExpiry', wfMsg('ipbotheroption') );
$this->BlockOther = $wgRequest->getVal( 'wpBlockOther', '' );
$mIpbexpiry = Xml::label( wfMsg( 'ipbexpiry' ), 'wpBlockExpiry' );
$mIpbother = Xml::label( wfMsg( 'ipbother' ), 'mw-bi-other' );
$mIpbothertime = wfMsgHtml( 'ipbotheroption' );
-
- $mIpbreasonother = Xml::label( wfMsg( 'ipbreason' ), 'wpBlockReasonList' );
- $mIpbreason = Xml::label( wfMsg( 'ipbotherreason' ), 'mw-bi-reason' );
- $mIpbreasonotherlist = wfMsgHtml( 'ipbreasonotherlist' );
-
+ $mIpbreason = Xml::label( wfMsg( 'ipbreason' ), 'mw-bi-reason' );
$titleObj = SpecialPage::getTitleFor( 'Blockip' );
$action = $titleObj->escapeLocalURL( "action=submit" );
$blockExpiryFormOptions .= "<option value=\"$value\"$selected>$show</option>";
}
- $scBlockReasonList = wfMsgForContent( 'ipbreason-list' );
- $blockReasonList = "<option value=\"other\">$mIpbreasonotherlist</option>";
- $optgroup = "";
- foreach ( explode( '*', $scBlockReasonList ) as $option) {
- $value = trim( htmlspecialchars($option) );
- if ( $value == '' )
- continue;
- if ( substr( $value, 0, 1) == '#' ) {
- $value = substr( $value, 1 );
- $blockReasonList .= "$optgroup<optgroup label=\"$value\">";
- $optgroup = "</optgroup>";
- } else {
- $selected = "";
- if ( $this->BlockReasonList === $value)
- $selected = ' selected="selected"';
- $blockReasonList .= "<option value=\"$value\"$selected>$value</option>";
- }
- }
- $blockReasonList .= $optgroup;
-
$token = htmlspecialchars( $wgUser->editToken() );
global $wgStylePath, $wgStyleVersion;
</td>
</tr>
<tr>
- <td align=\"right\">{$mIpbreasonother}:</td>
- <td align=\"left\">
- <select tabindex='4' id='wpBlockReasonList' name=\"wpBlockReasonList\">
- $blockReasonList
- </select>
- </td>
- </tr>
- <tr id='wpBlockReason'>
<td align=\"right\">{$mIpbreason}:</td>
<td align=\"left\">
" . Xml::input( 'wpBlockReason', 45, $this->BlockReason,
- array( 'tabindex' => '5', 'id' => 'mw-bi-reason' ) ) . "
+ array( 'tabindex' => '3', 'id' => 'mw-bi-reason' ) ) . "
</td>
</tr>
<tr id='wpAnonOnlyRow'>
<td align=\"left\">
" . wfCheckLabel( wfMsgHtml( 'ipbanononly' ),
'wpAnonOnly', 'wpAnonOnly', $this->BlockAnonOnly,
- array( 'tabindex' => '6' ) ) . "
+ array( 'tabindex' => '4' ) ) . "
</td>
</tr>
<tr id='wpCreateAccountRow'>
<td align=\"left\">
" . wfCheckLabel( wfMsgHtml( 'ipbcreateaccount' ),
'wpCreateAccount', 'wpCreateAccount', $this->BlockCreateAccount,
- array( 'tabindex' => '7' ) ) . "
+ array( 'tabindex' => '5' ) ) . "
</td>
</tr>
<tr id='wpEnableAutoblockRow'>
<td align=\"left\">
" . wfCheckLabel( wfMsgHtml( 'ipbenableautoblock' ),
'wpEnableAutoblock', 'wpEnableAutoblock', $this->BlockEnableAutoblock,
- array( 'tabindex' => '8' ) ) . "
+ array( 'tabindex' => '6' ) ) . "
</td>
</tr>
");
<td align=\"left\">
" . wfCheckLabel( wfMsgHtml( 'ipbhidename' ),
'wpHideName', 'wpHideName', $this->BlockHideName,
- array( 'tabindex' => '9' ) ) . "
+ array( 'tabindex' => '6' ) ) . "
</td>
</tr>
");
<td style='padding-top: 1em'> </td>
<td style='padding-top: 1em' align=\"left\">
" . Xml::submitButton( wfMsgHtml( 'ipbsubmit' ),
- array( 'name' => 'wpBlock', 'tabindex' => '10' ) ) . "
+ array( 'name' => 'wpBlock', 'tabindex' => '7' ) ) . "
</td>
</tr>
</table>" .
}
}
- $reasonstr = $this->BlockReasonList;
- if ( $reasonstr != 'other' && $this->BlockReason != '') {
- // Entry from drop down menu + additional comment
- $reasonstr .= ': ' . $this->BlockReason;
- } elseif ( $reasonstr == 'other' ) {
- $reasonstr = $this->BlockReason;
- }
-
$expirestr = $this->BlockExpiry;
if( $expirestr == 'other' )
$expirestr = $this->BlockOther;
# Note: for a user block, ipb_address is only for display purposes
$block = new Block( $this->BlockAddress, $userId, $wgUser->getID(),
- $reasonstr, wfTimestampNow(), 0, $expiry, $this->BlockAnonOnly,
+ $this->BlockReason, wfTimestampNow(), 0, $expiry, $this->BlockAnonOnly,
$this->BlockCreateAccount, $this->BlockEnableAutoblock, $this->BlockHideName);
if (wfRunHooks('BlockIp', array(&$block, &$wgUser))) {
$log_type = ($this->BlockHideName) ? 'oversight' : 'block';
$log = new LogPage( $log_type );
$log->addEntry( 'block', Title::makeTitle( NS_USER, $this->BlockAddress ),
- $reasonstr, $logParams );
+ $this->BlockReason, $logParams );
# Report to the user
$titleObj = SpecialPage::getTitleFor( 'Blockip' );
'ipadressorusername' => 'IP-Adresse oder Benutzername',
'ipbexpiry' => 'Sperrdauer',
'ipbreason' => 'Begründung',
-'ipbreasonotherlist' => 'Andere Begründung',
-'ipbreason-list' => '
-*#Sperrgründe für IP-Adressen
-*Vandalismus
-*Weblink-Spam
-*#Sperrgründe für Benutzernamen
-*Beleidigungen
-*Sockenpuppe',
'ipbanononly' => 'Nur anonyme Benutzer sperren',
'ipbcreateaccount' => 'Erstellung von Benutzerkonten verhindern',
'ipbenableautoblock' => 'Sperre die aktuell von diesem Benutzer genutzte IP-Adresse sowie automatisch alle folgenden, von denen aus er Bearbeitungen oder das Anlegen von Benutzeraccounts versucht',
'ipbother' => 'Andere Dauer (englisch)',
'ipboptions' => '1 Stunde:1 hour,2 Stunden:2 hours,6 Stunden:6 hours,1 Tag:1 day,3 Tage:3 days,1 Woche:1 week,2 Wochen:2 weeks,1 Monat:1 month,3 Monate:3 months,1 Jahr:1 year,Unbeschränkt:indefinite',
'ipbotheroption' => 'Andere Dauer',
-'ipbotherreason' => 'Andere/ergänzende Begründung',
'ipbhidename' => 'Benutzername/IP-Adresse im Sperr-Logbuch, der Liste aktiver Sperren und dem Benutzerverzeichnis verstecken.',
'badipaddress' => 'Die IP-Adresse hat ein falsches Format.',
'blockipsuccesssub' => 'Sperre erfolgreich',
'ipadressorusername' => 'IP Address or username',
'ipbexpiry' => 'Expiry',
'ipbreason' => 'Reason',
-'ipbreasonotherlist' => 'Other reason',
-
-// These are examples only. They can be translated but should be adjusted via [[MediaWiki:ipbreason-list]] by the local community
-// *# defines a reason group in the drow down menu
-// * defines a reason
-'ipbreason-list' => '
-*#Block reasons for IP adresses
-*vandalism
-*linkspam
-*#Block reasons for usernames
-*insults
-*sockpuppet',
'ipbanononly' => 'Block anonymous users only',
'ipbcreateaccount' => 'Prevent account creation',
'ipbenableautoblock' => 'Automatically block the last IP address used by this user, and any subsequent IPs they try to edit from',
'ipbother' => 'Other time',
'ipboptions' => '2 hours:2 hours,1 day:1 day,3 days:3 days,1 week:1 week,2 weeks:2 weeks,1 month:1 month,3 months:3 months,6 months:6 months,1 year:1 year,infinite:infinite',
'ipbotheroption' => 'other',
-'ipbotherreason' => 'Other/additional reason',
'ipbhidename' => 'Hide username/IP from the block log, active block list and user list',
'badipaddress' => 'Invalid IP address',
'blockipsuccesssub' => 'Block succeeded',
'blocklink' => 'block',
'unblocklink' => 'unblock',
'contribslink' => 'contribs',
-'autoblocker' => 'Autoblocked because your IP address has been recently used by "[[User:$1|$1]]". The reason given for $1\'s block is: "$2"',
+'autoblocker' => 'Autoblocked because your IP address has been recently used by "[[User:$1|$1]]". The reason given for $1\'s block is: "\'\'\'$2\'\'\'"',
'blocklogpage' => 'Block log',
'blocklogentry' => 'blocked "[[$1]]" with an expiry time of $2 $3',
'blocklogtext' => 'This is a log of user blocking and unblocking actions. Automatically