From fc394d6302b45ff61d8c55e3e9516f3c212bf04c Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Sun, 9 Apr 2006 21:20:24 +0000
Subject: - check m_ permission for quickmod [Bug #1317] - don't sync the
 global forum (id 0) [Bug #1383] - corrections to available time zones [Bug
 #1306] - only display open reports on mcp_front - added whois information to
 mcp_post [Bug #1400] - copy "dot" when copying a topic [Bug #1321] - some
 language corrections [Bugs #1324, #1255, #1317] - mozWrap scrolls back to
 previous position now [Bug #1190] - some style related corrections [Bugs
 #1322, #1454, #1316] - corrected copyrights [Bug #1468] - fixed links on
 search results page [Bug #1469]

git-svn-id: file:///svn/phpbb/trunk@5779 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/includes/mcp/mcp_post.php | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

(limited to 'phpBB/includes/mcp/mcp_post.php')

diff --git a/phpBB/includes/mcp/mcp_post.php b/phpBB/includes/mcp/mcp_post.php
index 5dfb5947f9..3880f036a8 100644
--- a/phpBB/includes/mcp/mcp_post.php
+++ b/phpBB/includes/mcp/mcp_post.php
@@ -34,6 +34,22 @@ function mcp_post_details($id, $mode, $action)
 
 	switch ($action)
 	{
+		case 'whois':
+			$ip = request_var('ip', '');
+			include($phpbb_root_path . 'includes/functions_user.' . $phpEx);
+			
+			$whois = user_ipwhois($ip);
+			
+			$whois = preg_replace('#(\s)([\w\-\._\+]+@[\w\-\.]+)(\s)#', '\1<a href="mailto:\2">\2</a>\3', $whois);
+			$whois = preg_replace('#(\s)(http:/{2}[^\s]*)(\s)#', '\1<a href="\2" target="_blank">\2</a>\3', $whois);
+			
+			$template->assign_vars(array(
+				'RETURN_POST'	=> sprintf($user->lang['RETURN_POST'], "<a href=\"{$phpbb_root_path}mcp.$phpEx$SID&amp;i=$id&amp;mode=$mode&amp;p=$post_id\">", '</a>'),
+				'WHOIS'			=> trim($whois))
+			);
+		// We're done with the whois page so return
+		return;
+
 		case 'chgposter':
 
 			$username = request_var('username', '');
@@ -249,7 +265,7 @@ function mcp_post_details($id, $mode, $action)
 				'L_POST_S'		=> ($row['postings'] == 1) ? $user->lang['POST'] : $user->lang['POSTS'],
 
 				'U_LOOKUP_IP'	=> ($rdns_ip_num == $row['poster_ip'] || $rdns_ip_num == 'all') ? '' : "$url&amp;i=$id&amp;mode=post_details&amp;rdns={$row['poster_ip']}#ip",
-				'U_WHOIS'		=> "{$phpbb_root_path}mcp.$phpEx$SID&amp;i=$id&amp;mode=whois&amp;ip={$row['poster_ip']}")
+				'U_WHOIS'		=> "{$phpbb_root_path}mcp.$phpEx$SID&amp;i=$id&amp;mode=$mode&amp;action=whois&amp;p=$post_id&amp;ip={$row['poster_ip']}")
 			);
 		}
 		$db->sql_freeresult($result);
-- 
cgit v1.2.1