X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FSpecialIpblocklist.php;h=641e1fdde68ac608afeabaed7abee8ba91839340;hb=cd56a97356138520c706067c9e3b9ee89344583f;hp=2b9d216de52280ff5c3c47e5b545349a9d250c38;hpb=7e87e13715d78bbf6e2f953fc511e80978f631f9;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/SpecialIpblocklist.php b/includes/SpecialIpblocklist.php
index 2b9d216de5..641e1fdde6 100644
--- a/includes/SpecialIpblocklist.php
+++ b/includes/SpecialIpblocklist.php
@@ -1,136 +1,429 @@
-<?
-
-function wfSpecialIpblocklist()
-{
-	global $wgUser, $wgOut, $action, $ip;
-
-	$fields = array( "wpUnblockAddress" );
-	wfCleanFormFields( $fields );
-	$ipu = new IPUnblockForm();
-
-	if ( "success" == $action ) {
-		$msg = str_replace( "$1", $ip, wfMsg( "ipusuccess" ) );
-		$ipu->showList( $msg );
-	} else if ( "submit" == $action ) {
-		if ( ! $wgUser->isSysop() ) {
-			$wgOut->sysopRequired();
+<?php
+/**
+ *
+ * @addtogroup SpecialPage
+ */
+
+/**
+ * @todo document
+ */
+function wfSpecialIpblocklist() {
+	global $wgUser, $wgOut, $wgRequest;
+	
+	$ip = $wgRequest->getVal( 'wpUnblockAddress', $wgRequest->getVal( 'ip' ) );
+	$id = $wgRequest->getVal( 'id' );
+	$reason = $wgRequest->getText( 'wpUnblockReason' );
+	$action = $wgRequest->getText( 'action' );
+	$successip = $wgRequest->getVal( 'successip' );
+
+	$ipu = new IPUnblockForm( $ip, $id, $reason );
+
+	if( $action == 'unblock' ) {
+		# Check permissions
+		if( !$wgUser->isAllowed( 'block' ) ) {
+			$wgOut->permissionRequired( 'block' );
+			return;
+		}
+		# Check for database lock
+		if( wfReadOnly() ) {
+			$wgOut->readOnlyPage();
+			return;
+		}
+		# Show unblock form
+		$ipu->showForm( '' );
+	} elseif( $action == 'submit' && $wgRequest->wasPosted()
+		&& $wgUser->matchEditToken( $wgRequest->getVal( 'wpEditToken' ) ) ) {
+		# Check permissions
+		if( !$wgUser->isAllowed( 'block' ) ) {
+			$wgOut->permissionRequired( 'block' );
+			return;
+		}
+		# Check for database lock
+		if( wfReadOnly() ) {
+			$wgOut->readOnlyPage();
 			return;
 		}
+		# Remove blocks and redirect user to success page
 		$ipu->doSubmit();
-	} else if ( "unblock" == $action ) {
-		$ipu->showForm( "" );
+	} elseif( $action == 'success' ) {
+		# Inform the user of a successful unblock
+		# (No need to check permissions or locks here,
+		# if something was done, then it's too late!)
+		if ( substr( $successip, 0, 1) == '#' ) {
+			// A block ID was unblocked
+			$ipu->showList( $wgOut->parse( wfMsg( 'unblocked-id', $successip ) ) );
+		} else {
+			// A username/IP was unblocked
+			$ipu->showList( $wgOut->parse( wfMsg( 'unblocked', $successip ) ) );
+		}
 	} else {
-		$ipu->showList( "" );
+		# Just show the block list
+		$ipu->showList( '' );
 	}
+
 }
 
+/**
+ * implements Special:ipblocklist GUI
+ * @addtogroup SpecialPage
+ */
 class IPUnblockForm {
+	var $ip, $reason, $id;
 
-	function showForm( $err )
-	{
-		global $wgOut, $wgUser, $wgLang;
-		global $ip, $wpUnblockAddress;
+	function IPUnblockForm( $ip, $id, $reason ) {
+		$this->ip = strtr( $ip, '_', ' ' );
+		$this->id = $id;
+		$this->reason = $reason;
+	}
 
-		$wgOut->setPagetitle( wfMsg( "unblockip" ) );
-		$wgOut->addWikiText( wfMsg( "unblockiptext" ) );
+	function showForm( $err ) {
+		global $wgOut, $wgUser, $wgSysopUserBans, $wgContLang;
 
-		if ( ! $wpUnblockAddress ) { $wpUnblockAddress = $ip; }
-		$ipa = wfMsg( "ipaddress" );
-		$ipus = wfMsg( "ipusubmit" );
-		$action = wfLocalUrlE( $wgLang->specialPage( "Ipblocklist" ),
-		  "action=submit" );
+		$wgOut->setPagetitle( wfMsg( 'unblockip' ) );
+		$wgOut->addWikiMsg( 'unblockiptext' );
+
+		$ipa = wfMsgHtml( $wgSysopUserBans ? 'ipadressorusername' : 'ipaddress' );
+		$ipr = wfMsgHtml( 'ipbreason' );
+		$ipus = wfMsgHtml( 'ipusubmit' );
+		$titleObj = SpecialPage::getTitleFor( "Ipblocklist" );
+		$action = $titleObj->getLocalURL( "action=submit" );
+		$alignRight = $wgContLang->isRtl() ? 'left' : 'right';
 
 		if ( "" != $err ) {
 			$wgOut->setSubtitle( wfMsg( "formerror" ) );
-			$wgOut->addHTML( "<p><font color='red' size='+1'>{$err}</font>\n" );
-		}
-		$wgOut->addHTML( "<p>
-<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>&nbsp;</td><td align=left>
-<input tabindex=2 type=submit name=\"wpBlock\" value=\"{$ipus}\">
-</td></tr></table>
-</form>\n" );
+			$wgOut->addWikiText( "<span class='error'>{$err}</span>\n" );
+		}
+		$token = htmlspecialchars( $wgUser->editToken() );
+
+		$addressPart = false;
+		if ( $this->id ) {
+			$block = Block::newFromID( $this->id );
+			if ( $block ) {
+				$encName = htmlspecialchars( $block->getRedactedName() );
+				$encId = $this->id;
+				$addressPart = $encName . Xml::hidden( 'id', $encId );
+			}
+		}
+		if ( !$addressPart ) {
+			$addressPart = Xml::input( 'wpUnblockAddress', 20, $this->ip, array( 'type' => 'text', 'tabindex' => '1' ) );
+		}
+
+		$wgOut->addHTML(
+			Xml::openElement( 'form', array( 'method' => 'post', 'action' => $action, 'id' => 'unblockip' ) ) .
+			Xml::openElement( 'table', array( 'border' => '0' ) ).
+			"<tr>
+				<td align='$alignRight'>
+					{$ipa}
+				</td>
+				<td>
+					{$addressPart}
+				</td>
+			</tr>
+			<tr>
+				<td align='$alignRight'>
+					{$ipr}
+				</td>
+				<td>" .
+					Xml::input( 'wpUnblockReason', 40, $this->reason, array( 'type' => 'text', 'tabindex' => '2' ) ) .
+				"</td>
+			</tr>
+			<tr>
+				<td>&nbsp;</td>
+				<td>" .
+					Xml::submitButton( $ipus, array( 'name' => 'wpBlock', 'tabindex' => '3' ) ) .
+				"</td>
+			</tr>" .
+			Xml::closeElement( 'table' ) .
+			Xml::hidden( 'wpEditToken', $token ) .
+			Xml::closeElement( 'form' ) . "\n"
+		);
 
 	}
-	
-	function doSubmit()
-	{
-		global $wgOut, $wgUser, $wgLang;
-		global $wpUnblockAddress;
 
-		$block = new Block();
-		$wpUnblockAddress = trim( $wpUnblockAddress );
+	const UNBLOCK_SUCCESS = 0; // Success
+	const UNBLOCK_NO_SUCH_ID = 1; // No such block ID
+	const UNBLOCK_USER_NOT_BLOCKED = 2; // IP wasn't blocked
+	const UNBLOCK_BLOCKED_AS_RANGE = 3; // IP is part of a range block
+	const UNBLOCK_UNKNOWNERR = 4; // Unknown error
+
+	/**
+	 * Backend code for unblocking. doSubmit() wraps around this.
+	 * $range is only used when UNBLOCK_BLOCKED_AS_RANGE is returned, in which
+	 * case it contains the range $ip is part of.
+	 * @return array array(message key, parameters) on failure, empty array on success
+	 */
 
-		if ( $wpUnblockAddress{0} == "#" ) {
-			$block->mId = substr( $wpUnblockAddress, 1 );
+	static function doUnblock(&$id, &$ip, &$reason, &$range = null)
+	{
+		if ( $id ) {
+			$block = Block::newFromID( $id );
+			if ( !$block ) {
+				return array('ipb_cant_unblock', htmlspecialchars($id));
+			}
+			$ip = $block->getRedactedName();
 		} else {
-			$block->mAddress = $wpUnblockAddress;
+			$block = new Block();
+			$ip = trim( $ip );
+			if ( substr( $ip, 0, 1 ) == "#" ) {
+				$id = substr( $ip, 1 );
+				$block = Block::newFromID( $id );
+				if( !$block ) {
+					return array('ipb_cant_unblock', htmlspecialchars($id));
+				}
+				$ip = $block->getRedactedName();
+			} else {
+				$block = Block::newFromDB( $ip );
+				if ( !$block ) { 
+					return array('ipb_cant_unblock', htmlspecialchars($id));
+				}
+				if( $block->mRangeStart != $block->mRangeEnd
+						&& !strstr( $ip, "/" ) ) {
+					/* If the specified IP is a single address, and the block is
+					 * a range block, don't unblock the range. */
+					 $range = $block->mAddress;
+					 return array('ipb_blocked_as_range', $ip, $range);
+				}
+			}
 		}
-		
-		$block->delete();
+		// Yes, this is really necessary
+		$id = $block->mId;
 
-		$success = wfLocalUrl( $wgLang->specialPage( "Ipblocklist" ),
-		  "action=success&ip=" . urlencode($wpUnblockAddress) );
-		$wgOut->redirect( $success );
+		# Delete block
+		if ( !$block->delete() ) {
+			return array('ipb_cant_unblock', htmlspecialchars($id));
+		}
+
+		# Make log entry
+		$log = new LogPage( 'block' );
+		$log->addEntry( 'unblock', Title::makeTitle( NS_USER, $ip ), $reason );
+		return array();
 	}
 
-	function showList( $msg )
-	{
+	function doSubmit() {
 		global $wgOut;
-		
+		$retval = self::doUnblock($this->id, $this->ip, $this->reason, $range);
+		if(!empty($retval))
+		{
+			$key = array_shift($retval);
+			$this->showForm(wfMsgReal($key, $retval));
+			return;
+		}
+		# Report to the user
+		$titleObj = SpecialPage::getTitleFor( "Ipblocklist" );
+		$success = $titleObj->getFullURL( "action=success&successip=" . urlencode( $this->ip ) );
+		$wgOut->redirect( $success );
+	}
+
+	function showList( $msg ) {
+		global $wgOut, $wgUser;
+
 		$wgOut->setPagetitle( wfMsg( "ipblocklist" ) );
 		if ( "" != $msg ) {
 			$wgOut->setSubtitle( $msg );
 		}
-		$wgOut->addHTML( "<ul>" );
-		Block::enumBlocks( "wfAddRow", 0 );
-		$wgOut->addHTML( "</ul>\n" );
+
+		// Purge expired entries on one in every 10 queries
+		if ( !mt_rand( 0, 10 ) ) {
+			Block::purgeExpired();
+		}
+
+		$conds = array();
+		$matches = array();
+		// Is user allowed to see all the blocks?
+		if ( !$wgUser->isAllowed( 'oversight' ) )
+			$conds['ipb_deleted'] = 0;
+		if ( $this->ip == '' ) {
+			// No extra conditions
+		} elseif ( substr( $this->ip, 0, 1 ) == '#' ) {
+			$conds['ipb_id'] = substr( $this->ip, 1 );
+		} elseif ( IP::toUnsigned( $this->ip ) !== false ) {
+			$conds['ipb_address'] = $this->ip;
+			$conds['ipb_auto'] = 0;
+		} elseif( preg_match( '/^(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})\\/(\\d{1,2})$/', $this->ip, $matches ) ) {
+			$conds['ipb_address'] = Block::normaliseRange( $this->ip );
+			$conds['ipb_auto'] = 0;
+		} else {
+			$user = User::newFromName( $this->ip );
+			if ( $user && ( $id = $user->getID() ) != 0 ) {
+				$conds['ipb_user'] = $id;
+			} else {
+				// Uh...?
+				$conds['ipb_address'] = $this->ip;
+				$conds['ipb_auto'] = 0;
+			}
+		}
+
+		$pager = new IPBlocklistPager( $this, $conds );
+		if ( $pager->getNumRows() ) {
+			$wgOut->addHTML(
+				$this->searchForm() .
+				$pager->getNavigationBar() .
+				Xml::tags( 'ul', null, $pager->getBody() ) .
+				$pager->getNavigationBar()
+			);
+		} elseif ( $this->ip != '') {
+			$wgOut->addHTML( $this->searchForm() );
+			$wgOut->addWikiMsg( 'ipblocklist-no-results' );
+		} else {
+			$wgOut->addWikiMsg( 'ipblocklist-empty' );
+		}
 	}
-}
 
-# Callback function to output a block
-function wfAddRow( $block, $tag ) {
-	global $wgOut, $wgUser, $wgLang, $ip;
+	function searchForm() {
+		global $wgTitle, $wgScript, $wgRequest;
+		return
+			Xml::tags( 'form', array( 'action' => $wgScript ),
+				Xml::hidden( 'title', $wgTitle->getPrefixedDbKey() ) .
+				Xml::openElement( 'fieldset' ) .
+				Xml::element( 'legend', null, wfMsg( 'ipblocklist-legend' ) ) .
+				Xml::inputLabel( wfMsg( 'ipblocklist-username' ), 'ip', 'ip', /* size */ false, $this->ip ) .
+				'&nbsp;' .
+				Xml::submitButton( wfMsg( 'ipblocklist-submit' ) ) .
+				Xml::closeElement( 'fieldset' )
+			);
+	}
+
+	/**
+	 * Callback function to output a block
+	 */
+	function formatRow( $block ) {
+		global $wgUser, $wgLang;
+
+		wfProfileIn( __METHOD__ );
+
+		static $sk=null, $msg=null;
+
+		if( is_null( $sk ) )
+			$sk = $wgUser->getSkin();
+		if( is_null( $msg ) ) {
+			$msg = array();
+			$keys = array( 'infiniteblock', 'expiringblock', 'unblocklink',
+				'anononlyblock', 'createaccountblock', 'noautoblockblock', 'emailblock' );
+			foreach( $keys as $key ) {
+				$msg[$key] = wfMsgHtml( $key );
+			}
+			$msg['blocklistline'] = wfMsg( 'blocklistline' );
+		}
+
+		# Prepare links to the blocker's user and talk pages
+		$blocker_id = $block->getBy();
+		$blocker_name = $block->getByName();
+		$blocker = $sk->userLink( $blocker_id, $blocker_name );
+		$blocker .= $sk->userToolLinks( $blocker_id, $blocker_name );
+
+		# Prepare links to the block target's user and contribs. pages (as applicable, don't do it for autoblocks)
+		if( $block->mAuto ) {
+			$target = $block->getRedactedName(); # Hide the IP addresses of auto-blocks; privacy
+		} else {
+			$target = $sk->userLink( $block->mUser, $block->mAddress )
+				. $sk->userToolLinks( $block->mUser, $block->mAddress, false, Linker::TOOL_LINKS_NOBLOCK );
+		}
+		
+		$formattedTime = $wgLang->timeanddate( $block->mTimestamp, true );
+
+		$properties = array();
+		if ( $block->mExpiry === "" || $block->mExpiry === Block::infinity() ) {
+			$properties[] = $msg['infiniteblock'];
+		} else {
+			$properties[] = wfMsgReplaceArgs( $msg['expiringblock'],
+				array( $wgLang->timeanddate( $block->mExpiry, true ) ) );
+		}
+		if ( $block->mAnonOnly ) {
+			$properties[] = $msg['anononlyblock'];
+		}
+		if ( $block->mCreateAccount ) {
+			$properties[] = $msg['createaccountblock'];
+		}
+		if (!$block->mEnableAutoblock && $block->mUser ) {
+			$properties[] = $msg['noautoblockblock'];
+		}
 
-	$sk = $wgUser->getSkin();
+		if ( $block->mBlockEmail && $block->mUser ) {
+			$properties[] = $msg['emailblock'];
+		}
 
-	# Hide addresses blocked by User::spreadBlocks, for privacy
-	$addr = $block->mAuto ? "#{$block->mId}" : $block->mAddress;
+		$properties = implode( ', ', $properties );
 
-	$name = User::whoIs( $block->mBy );
-	$ulink = $sk->makeKnownLink( $wgLang->getNsText( Namespace::getUser() ). ":{$name}", $name );
-	$d = $wgLang->timeanddate( $block->mTimestamp, true );
+		$line = wfMsgReplaceArgs( $msg['blocklistline'], array( $formattedTime, $blocker, $target, $properties ) );
 
-	$line = str_replace( "$1", $d, wfMsg( "blocklistline" ) );
-	$line = str_replace( "$2", $ulink, $line );
-	$line = str_replace( "$3", $addr, $line );
+		$unblocklink = '';
+		if ( $wgUser->isAllowed('block') ) {
+			$titleObj = SpecialPage::getTitleFor( "Ipblocklist" );
+			$unblocklink = ' (' . $sk->makeKnownLinkObj($titleObj, $msg['unblocklink'], 'action=unblock&id=' . urlencode( $block->mId ) ) . ')';
+		}
+		
+		$comment = $sk->commentBlock( $block->mReason );
+		
+		$s = "{$line} $comment";	
+		if ( $block->mHideName )
+			$s = '<span class="history-deleted">' . $s . '</span>';
+				
+		wfProfileOut( __METHOD__ );
+		return "<li>$s $unblocklink</li>\n";
+	}
+}
+
+/**
+ * @todo document
+ * @addtogroup Pager
+ */
+class IPBlocklistPager extends ReverseChronologicalPager {
+	public $mForm, $mConds;
+
+	function __construct( $form, $conds = array() ) {
+		$this->mForm = $form;
+		$this->mConds = $conds;
+		parent::__construct();
+	}
 
-	$wgOut->addHTML( "<li>{$line}" );
+	function getStartBody() {
+		wfProfileIn( __METHOD__ );
+		# Do a link batch query
+		$this->mResult->seek( 0 );
+		$lb = new LinkBatch;
+
+		/*
+		while ( $row = $this->mResult->fetchObject() ) {
+			$lb->addObj( Title::makeTitleSafe( NS_USER, $row->user_name ) );
+			$lb->addObj( Title::makeTitleSafe( NS_USER_TALK, $row->user_name ) );
+			$lb->addObj( Title::makeTitleSafe( NS_USER, $row->ipb_address ) );
+			$lb->addObj( Title::makeTitleSafe( NS_USER_TALK, $row->ipb_address ) );
+		}*/
+		# Faster way
+		# Usernames and titles are in fact related by a simple substitution of space -> underscore
+		# The last few lines of Title::secureAndSplit() tell the story.
+		while ( $row = $this->mResult->fetchObject() ) {
+			$name = str_replace( ' ', '_', $row->ipb_by_text );
+			$lb->add( NS_USER, $name );
+			$lb->add( NS_USER_TALK, $name );
+			$name = str_replace( ' ', '_', $row->ipb_address );
+			$lb->add( NS_USER, $name );
+			$lb->add( NS_USER_TALK, $name );
+		}
+		$lb->execute();
+		wfProfileOut( __METHOD__ );
+		return '';
+	}
 	
-	if ( !$block->mAuto ) {
-		$clink = "<a href=\"" . wfLocalUrlE( $wgLang->specialPage(
-		  "Contributions" ), "target={$block->mAddress}" ) . "\">" .
-		  wfMsg( "contribslink" ) . "</a>";
-		$wgOut->addHTML( " ({$clink})" );
+	function formatRow( $row ) {
+		$block = new Block;
+		$block->initFromRow( $row );
+		return $this->mForm->formatRow( $block );
 	}
 
-	if ( $wgUser->isSysop() ) {
-		$ublink = "<a href=\"" . wfLocalUrlE( $wgLang->specialPage(
-		  "Ipblocklist" ), "action=unblock&ip=" . urlencode( $addr ) ) . "\">" .
-		  wfMsg( "unblocklink" ) . "</a>";
-		$wgOut->addHTML( " ({$ublink})" );
+	function getQueryInfo() {
+		$conds = $this->mConds;
+		$conds[] = 'ipb_expiry>' . $this->mDb->addQuotes( $this->mDb->timestamp() );
+		return array(
+			'tables' => 'ipblocks',
+			'fields' => '*',
+			'conds' => $conds,
+		);
 	}
-	if ( "" != $block->mReason ) {
-		$wgOut->addHTML( " <em>(" . wfEscapeHTML( $block->mReason ) .
-		  ")</em>" );
+
+	function getIndexField() {
+		return 'ipb_timestamp';
 	}
-	$wgOut->addHTML( "</li>\n" );
 }
 
 
-?>