From aa9e63fe6d7559b6a72aba4dbf4797a4e26cdc6e Mon Sep 17 00:00:00 2001
From: Rob Church <robchurch@users.mediawiki.org>
Date: Sun, 15 Jan 2006 03:15:54 +0000
Subject: [PATCH] Generate link to talk page of the blocker in
 Special:Ipblocklist, move contribs. link of the target next to their name

---
 RELEASE-NOTES                   |  3 ++-
 includes/SpecialIpblocklist.php | 27 ++++++++++++++++-----------
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 62f6979d8f..b51faacdc7 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -308,7 +308,8 @@ Special Pages:
 * (bug 4359) red [[user:#id]] links generated in [[special:Log]]
 * (bug 1996) Special page to list redirects
 * (bug 4334) Add "watch" links to Special:Unwatchedpages
-* Generate user page links in Special:Ipblocklist where appropriate (i.e. not an autoblock)
+* Generate target user page links in Special:Ipblocklist where appropriate (i.e. not an autoblock)
+* Generate link to talk page of the blocker in Special:Ipblocklist, move contribs. link of the target next to their name
 
 Misc.:
 * PHP 4.1 compatibility fix: don't use new_link parameter to mysql_connect
diff --git a/includes/SpecialIpblocklist.php b/includes/SpecialIpblocklist.php
index 789e70dfc7..063b11b1da 100644
--- a/includes/SpecialIpblocklist.php
+++ b/includes/SpecialIpblocklist.php
@@ -136,7 +136,7 @@ class IPUnblockForm {
 
 		$search = $this->searchForm();
 		$wgOut->addHTML( $search );
-
+		
 		$wgOut->addHTML( "<ul>" );
 		if( !Block::enumBlocks( array( &$this, "addRow" ), 0 ) ) {
 			// FIXME hack to solve #bug 1487
@@ -210,13 +210,23 @@ class IPUnblockForm {
 				$msg[$key] = wfMsgHtml( $key );
 			}
 			$msg['blocklistline'] = wfMsg( 'blocklistline' );
+			$msg['contribslink'] = wfMsg( 'contribslink' );
 		}
 
-		# Hide addresses blocked by User::spreadBlocks, for privacy
-		$addr = $block->mAuto ? "#{$block->mId}" : $sk->makeKnownLinkObj( Title::makeTitle( NS_USER, $block->mAddress ), $block->mAddress );
 
-		$name = $block->getByName();
-		$ulink = $sk->makeKnownLinkObj( Title::makeTitle( NS_USER, $name ), $name );
+		# Prepare links to the blocker's user and talk pages
+		$blocker_name = $block->getByName();
+		$blocker = $sk->MakeKnownLinkObj( Title::makeTitle( NS_USER, $blocker_name ), $blocker_name );
+		$blocker .= ' (' . $sk->makeKnownLinkObj( Title::makeTitle( NS_USER_TALK, $blocker_name ), $wgLang->getNsText( NS_TALK ) ) . ')';
+
+		# Prepare links to the block target's user and contribs. pages (as applicable, don't do it for autoblocks)
+		if( $block->mAuto ) {
+			$target = '#' . $block->mID; # Hide the IP addresses of auto-blocks; privacy
+		} else {
+			$target = $sk->makeKnownLinkObj( Title::makeTitle( NS_USER, $block->mAddress ), $block->mAddress );
+			$target .= ' (' . $sk->makeKnownLinkObj( Title::makeTitle( NS_SPECIAL, 'Contributions' ), $msg['contribslink'], 'target=' . $block->mAddress ) . ')';
+		}
+		
 		$formattedTime = $wgLang->timeanddate( $block->mTimestamp, true );
 
 		if ( $block->mExpiry === "" ) {
@@ -226,15 +236,10 @@ class IPUnblockForm {
 				array( $wgLang->timeanddate( $block->mExpiry, true ) ) );
 		}
 
-		$line = wfMsgReplaceArgs( $msg['blocklistline'], array( $formattedTime, $ulink, $addr, $formattedExpiry ) );
+		$line = wfMsgReplaceArgs( $msg['blocklistline'], array( $formattedTime, $blocker, $target, $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 ) ) . ')' );
-- 
2.20.1