-<?
-
-function wfSpecialIpblocklist()
-{
- global $wgUser, $wgOut, $action, $ip;
-
- $fields = array( "wpUnblockAddress" );
- wfCleanFormFields( $fields );
- $ipu = new IPUnblockForm();
+<?php
+/**
+ *
+ * @package MediaWiki
+ * @subpackage SpecialPage
+ */
+
+/**
+ * @todo document
+ */
+function wfSpecialIpblocklist() {
+ global $wgUser, $wgOut, $wgRequest;
+
+ $ip = $wgRequest->getVal( 'wpUnblockAddress', $wgRequest->getVal( 'ip' ) );
+ $reason = $wgRequest->getText( 'wpUnblockReason' );
+ $action = $wgRequest->getText( 'action' );
+
+ $ipu = new IPUnblockForm( $ip, $reason );
if ( "success" == $action ) {
- $msg = wfMsg( "ipusuccess", $ip );
+ $msg = wfMsg( "ipusuccess", htmlspecialchars( $ip ) );
$ipu->showList( $msg );
- } else if ( "submit" == $action ) {
- if ( ! $wgUser->isSysop() ) {
+ } else if ( "submit" == $action && $wgRequest->wasPosted() &&
+ $wgUser->matchEditToken( $wgRequest->getVal( 'wpEditToken' ) ) ) {
+ if ( ! $wgUser->isAllowed('block') ) {
$wgOut->sysopRequired();
return;
}
}
}
+/**
+ *
+ * @package MediaWiki
+ * @subpackage SpecialPage
+ */
class IPUnblockForm {
-
+ var $ip, $reason;
+
+ function IPUnblockForm( $ip, $reason ) {
+ $this->ip = $ip;
+ $this->reason = $reason;
+ }
+
function showForm( $err )
{
global $wgOut, $wgUser, $wgLang;
- global $ip, $wpUnblockAddress;
$wgOut->setPagetitle( wfMsg( "unblockip" ) );
$wgOut->addWikiText( wfMsg( "unblockiptext" ) );
- if ( ! $wpUnblockAddress ) { $wpUnblockAddress = $ip; }
$ipa = wfMsg( "ipaddress" );
$ipr = wfMsg( "ipbreason" );
- $ipus = wfMsg( "ipusubmit" );
- $action = wfLocalUrlE( $wgLang->specialPage( "Ipblocklist" ),
- "action=submit" );
+ $ipus = htmlspecialchars( wfMsg( "ipusubmit" ) );
+ $titleObj = Title::makeTitle( NS_SPECIAL, "Ipblocklist" );
+ $action = $titleObj->escapeLocalURL( "action=submit" );
if ( "" != $err ) {
$wgOut->setSubtitle( wfMsg( "formerror" ) );
- $wgOut->addHTML( "<p><font color='red' size='+1'>{$err}</font>\n" );
+ $wgOut->addHTML( "<p class='error'>{$err}</p>\n" );
}
- $wgOut->addHTML( "<p>
+ $token = htmlspecialchars( $wgUser->editToken() );
+
+ $wgOut->addHTML( "
<form id=\"unblockip\" method=\"post\" action=\"{$action}\">
-<table border=0><tr>
-<td align=right>{$ipa}:</td>
-<td align=left>
-<input tabindex=1 type=text size=20 name=\"wpUnblockAddress\" value=\"{$wpUnblockAddress}\">
-</td></tr><tr>
-<td align=right>{$ipr}:</td>
-<td align=left>
-<input tabindex=1 type=text size=40 name=\"wpUnblockReason\" value=\"{$wpUnblockReason}\">
-</td></tr><tr>
-<td> </td><td align=left>
-<input tabindex=2 type=submit name=\"wpBlock\" value=\"{$ipus}\">
-</td></tr></table>
+ <table border='0'>
+ <tr>
+ <td align='right'>{$ipa}:</td>
+ <td align='left'>
+ <input tabindex='1' type='text' size='20' name=\"wpUnblockAddress\" value=\"" . htmlspecialchars( $this->ip ) . "\" />
+ </td>
+ </tr>
+ <tr>
+ <td align='right'>{$ipr}:</td>
+ <td align='left'>
+ <input tabindex='1' type='text' size='40' name=\"wpUnblockReason\" value=\"" . htmlspecialchars( $this->reason ) . "\" />
+ </td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td align='left'>
+ <input tabindex='2' type='submit' name=\"wpBlock\" value=\"{$ipus}\" />
+ </td>
+ </tr>
+ </table>
+ <input type='hidden' name='wpEditToken' value=\"{$token}\" />
</form>\n" );
}
- function doSubmit()
- {
+ function doSubmit() {
global $wgOut, $wgUser, $wgLang;
- global $wpUnblockAddress, $wpUnblockReason;
$block = new Block();
- $wpUnblockAddress = trim( $wpUnblockAddress );
+ $this->ip = trim( $this->ip );
- if ( $wpUnblockAddress{0} == "#" ) {
- $block->mId = substr( $wpUnblockAddress, 1 );
+ if ( $this->ip{0} == "#" ) {
+ $block->mId = substr( $this->ip, 1 );
} else {
- $block->mAddress = $wpUnblockAddress;
+ $block->mAddress = $this->ip;
}
# Delete block (if it exists)
$block->delete();
# Make log entry
- $log = new LogPage( wfMsg( "blocklogpage" ), wfMsg( "blocklogtext" ) );
- $action = wfMsg( "unblocklogentry", $wpUnblockAddress );
- $log->addEntry( $action, $wpUnblockReason );
+ $log = new LogPage( 'block' );
+ $log->addEntry( 'unblock', Title::makeTitle( NS_USER, $this->ip ), $this->reason );
# Report to the user
- $success = wfLocalUrl( $wgLang->specialPage( "Ipblocklist" ),
- "action=success&ip=" . urlencode($wpUnblockAddress) );
+ $titleObj = Title::makeTitle( NS_SPECIAL, "Ipblocklist" );
+ $success = $titleObj->getFullURL( "action=success&ip=" . urlencode( $this->ip ) );
$wgOut->redirect( $success );
}
- function showList( $msg )
- {
+ function showList( $msg ) {
global $wgOut;
$wgOut->setPagetitle( wfMsg( "ipblocklist" ) );
}
}
-# Callback function to output a block
+/**
+ * Callback function to output a block
+ */
function wfAddRow( $block, $tag ) {
- global $wgOut, $wgUser, $wgLang, $ip;
+ global $wgOut, $wgUser, $wgLang, $wgContLang;
$sk = $wgUser->getSkin();
$addr = $block->mAuto ? "#{$block->mId}" : $block->mAddress;
$name = User::whoIs( $block->mBy );
- $ulink = $sk->makeKnownLink( $wgLang->getNsText( Namespace::getUser() ). ":{$name}", $name );
- $d = $wgLang->timeanddate( $block->mTimestamp, true );
-
- $line = wfMsg( "blocklistline", $d, $ulink, $addr );
+ $ulink = $sk->makeKnownLinkObj( Title::makeTitle( NS_USER, $name ), $name );
+ $formattedTime = $wgLang->timeanddate( $block->mTimestamp, true );
- $wgOut->addHTML( "<li>{$line}" );
+ if ( $block->mExpiry === "" ) {
+ $formattedExpiry = "indefinite";
+ } else {
+ $formattedExpiry = $wgLang->timeanddate( $block->mExpiry, true );
+ }
+ $line = wfMsg( "blocklistline", $formattedTime, $ulink, $addr, $formattedExpiry );
+
+ $wgOut->addHTML( "<li>{$line}" );
+
if ( !$block->mAuto ) {
- $clink = "<a href=\"" . wfLocalUrlE( $wgLang->specialPage(
- "Contributions" ), "target={$block->mAddress}" ) . "\">" .
+ $titleObj = Title::makeTitle( NS_SPECIAL, "Contributions" );
+ $clink = "<a href=\"" . $titleObj->escapeLocalURL( "target={$block->mAddress}" ) . "\">" .
wfMsg( "contribslink" ) . "</a>";
$wgOut->addHTML( " ({$clink})" );
}
- if ( $wgUser->isSysop() ) {
- $ublink = "<a href=\"" . wfLocalUrlE( $wgLang->specialPage(
- "Ipblocklist" ), "action=unblock&ip=" . urlencode( $addr ) ) . "\">" .
+ if ( $wgUser->isAllowed('block') ) {
+ $titleObj = Title::makeTitle( NS_SPECIAL, "Ipblocklist" );
+ $ublink = "<a href=\"" .
+ $titleObj->escapeLocalURL( "action=unblock&ip=" . urlencode( $addr ) ) . "\">" .
wfMsg( "unblocklink" ) . "</a>";
$wgOut->addHTML( " ({$ublink})" );
}
- if ( "" != $block->mReason ) {
- $wgOut->addHTML( " <em>(" . wfEscapeHTML( $block->mReason ) .
- ")</em>" );
- }
+ $wgOut->addHTML( $sk->commentBlock( $block->mReason ) );
$wgOut->addHTML( "</li>\n" );
}
dépôts / lhc / web / wiklou.git / blobdiff