-<?
-
-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 = str_replace( "$1", $ip, wfMsg( "ipusuccess" ) );
+ $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, $wgSysopUserBans;
- function showForm( $err )
- {
- global $wgOut, $wgUser, $wgLang;
- global $ip, $wpUnblockAddress;
-
- $wgOut->setPagetitle( wfMsg( "unblockip" ) );
- $wgOut->addWikiText( wfMsg( "unblockiptext" ) );
+ $wgOut->setPagetitle( wfMsg( 'unblockip' ) );
+ $wgOut->addWikiText( wfMsg( 'unblockiptext' ) );
- if ( ! $wpUnblockAddress ) { $wpUnblockAddress = $ip; }
- $ipa = wfMsg( "ipaddress" );
- $ipus = wfMsg( "ipusubmit" );
- $action = wfLocalUrlE( $wgLang->specialPage( "Ipblocklist" ),
- "action=submit" );
+ $ipa = wfMsgHtml( $wgSysopUserBans ? 'ipadressorusername' : 'ipaddress' );
+ $ipr = wfMsgHtml( 'ipbreason' );
+ $ipus = wfMsgHtml( '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->addWikitext( "<span class='error'>{$err}</span>\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> </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() {
+ global $wgOut, $wgUser;
- function doSubmit()
- {
- global $wgOut, $wgUser, $wgLang;
- global $ip, $wpUnblockAddress;
- $fname = "IPUnblockForm::doSubmit";
+ $block = new Block();
+ $this->ip = trim( $this->ip );
+
+ if ( $this->ip{0} == "#" ) {
+ $block->mId = substr( $this->ip, 1 );
+ } else {
+ $block->mAddress = $this->ip;
+ }
- $sql = "DELETE FROM ipblocks WHERE ipb_address='{$wpUnblockAddress}'";
- wfQuery( $sql, $fname );
+ # Delete block (if it exists)
+ # We should probably check for errors rather than just declaring success
+ $block->delete();
- $success = wfLocalUrl( $wgLang->specialPage( "Ipblocklist" ),
- "action=success&ip={$wpUnblockAddress}" );
+ # Make log entry
+ $log = new LogPage( 'block' );
+ $log->addEntry( 'unblock', Title::makeTitle( NS_USER, $this->ip ), $this->reason );
+
+ # Report to the user
+ $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" ) );
if ( "" != $msg ) {
$wgOut->setSubtitle( $msg );
}
+ global $wgRequest;
+ list( $this->limit, $this->offset ) = $wgRequest->getLimitOffset();
+ $this->counter = 0;
+
+ $paging = '<p>' . wfViewPrevNext( $this->offset, $this->limit,
+ Title::makeTitle( NS_SPECIAL, 'Ipblocklist' ),
+ 'ip=' . urlencode( $this->ip ) ) . "</p>\n";
+ $wgOut->addHTML( $paging );
+
+ $search = $this->searchForm();
+ $wgOut->addHTML( $search );
+
$wgOut->addHTML( "<ul>" );
- Block::enumBlocks( "wfAddRow", 0 );
+ if( !Block::enumBlocks( array( &$this, "addRow" ), 0 ) ) {
+ // FIXME hack to solve #bug 1487
+ $wgOut->addHTML( '<li>'.wfMsgHtml( 'ipblocklistempty' ).'</li>' );
+ }
$wgOut->addHTML( "</ul>\n" );
+ $wgOut->addHTML( $paging );
}
-}
-
-# Callback function
-function wfAddRow( $block, $tag ) {
- global $wgOut, $wgUser, $wgLang, $ip;
-
- $sk = $wgUser->getSkin();
- $addr = $block->mAddress;
- $name = User::whoIs( $block->mBy );
- $ulink = $sk->makeKnownLink( $wgLang->getNsText( Namespace::getUser() ). ":{$name}", $name );
- $d = $wgLang->timeanddate( $block->mTimestamp, true );
-
- $line = str_replace( "$1", $d, wfMsg( "blocklistline" ) );
- $line = str_replace( "$2", $ulink, $line );
- $line = str_replace( "$3", $block->mAddress, $line );
-
- $wgOut->addHTML( "<li>{$line}" );
- $clink = "<a href=\"" . wfLocalUrlE( $wgLang->specialPage(
- "Contributions" ), "target={$addr}" ) . "\">" .
- wfMsg( "contribslink" ) . "</a>";
- $wgOut->addHTML( " ({$clink})" );
-
- if ( $wgUser->isSysop() ) {
- $ublink = "<a href=\"" . wfLocalUrlE( $wgLang->specialPage(
- "Ipblocklist" ), "action=unblock&ip={$addr}" ) . "\">" .
- wfMsg( "unblocklink" ) . "</a>";
- $wgOut->addHTML( " ({$ublink})" );
+
+ function searchForm() {
+ global $wgTitle;
+ return
+ wfElement( 'form', array(
+ 'action' => $wgTitle->getLocalUrl() ),
+ null ) .
+ wfElement( 'input', array(
+ 'type' => 'hidden',
+ 'name' => 'action',
+ 'value' => 'search' ) ).
+ wfElement( 'input', array(
+ 'type' => 'hidden',
+ 'name' => 'limit',
+ 'value' => $this->limit ) ).
+ wfElement( 'input', array(
+ 'name' => 'ip',
+ 'value' => $this->ip ) ) .
+ wfElement( 'input', array(
+ 'type' => 'submit',
+ 'value' => wfMsg( 'search' ) ) ) .
+ '</form>';
}
- if ( "" != $block->mReason ) {
- $wgOut->addHTML( " <em>(" . wfEscapeHTML( $block->mReason ) .
- ")</em>" );
+
+ /**
+ * Callback function to output a block
+ */
+ function addRow( $block, $tag ) {
+ global $wgOut, $wgUser, $wgLang;
+
+ if( $this->ip != '' ) {
+ if( $block->mAuto ) {
+ if( stristr( $block->mId, $this->ip ) == false ) {
+ return;
+ }
+ } else {
+ if( stristr( $block->mAddress, $this->ip ) == false ) {
+ return;
+ }
+ }
+ }
+
+ // Loading blocks is fast; displaying them is slow.
+ // Quick hack for paging.
+ $this->counter++;
+ if( $this->counter <= $this->offset ) {
+ return;
+ }
+ if( $this->counter - $this->offset > $this->limit ) {
+ return;
+ }
+
+ $fname = 'IPUnblockForm-addRow';
+ wfProfileIn( $fname );
+
+ static $sk=null, $msg=null;
+
+ if( is_null( $sk ) )
+ $sk = $wgUser->getSkin();
+ if( is_null( $msg ) ) {
+ $msg = array();
+ foreach( array( 'infiniteblock', 'expiringblock', 'contribslink', 'unblocklink' ) as $key ) {
+ $msg[$key] = wfMsgHtml( $key );
+ }
+ $msg['blocklistline'] = wfMsg( 'blocklistline' );
+ }
+
+ # Hide addresses blocked by User::spreadBlocks, for privacy
+ $addr = $block->mAuto ? "#{$block->mId}" : $block->mAddress;
+
+ $name = $block->getByName();
+ $ulink = $sk->makeKnownLinkObj( Title::makeTitle( NS_USER, $name ), $name );
+ $formattedTime = $wgLang->timeanddate( $block->mTimestamp, true );
+
+ if ( $block->mExpiry === "" ) {
+ $formattedExpiry = $msg['infiniteblock'];
+ } else {
+ $formattedExpiry = wfMsgReplaceArgs( $msg['expiringblock'],
+ array( $wgLang->timeanddate( $block->mExpiry, true ) ) );
+ }
+
+ $line = wfMsgReplaceArgs( $msg['blocklistline'], array( $formattedTime, $ulink, $addr, $formattedExpiry ) );
+
+ $wgOut->addHTML( "<li>{$line}" );
+
+ if ( !$block->mAuto ) {
+ $titleObj = Title::makeTitle( NS_SPECIAL, "Contributions" );
+ $wgOut->addHTML( ' (' . $sk->makeKnownLinkObj($titleObj, $msg['contribslink'], "target={$block->mAddress}") . ')' );
+ }
+
+ if ( $wgUser->isAllowed('block') ) {
+ $titleObj = Title::makeTitle( NS_SPECIAL, "Ipblocklist" );
+ $wgOut->addHTML( ' (' . $sk->makeKnownLinkObj($titleObj, $msg['unblocklink'], 'action=unblock&ip=' . urlencode( $addr ) ) . ')' );
+ }
+ $wgOut->addHTML( $sk->commentBlock( $block->mReason ) );
+ $wgOut->addHTML( "</li>\n" );
+ wfProfileOut( $fname );
}
- $wgOut->addHTML( "</li>\n" );
}
-
?>
dépôts / lhc / web / wiklou.git / blobdiff