makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 22:28:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

#i51 - #i63 - #i64

Browse source 
git-svn-id: file:///svn/phpbb/trunk@8095 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen 2007-09-21 15:05:04 +00:00
parent 69d29e9282
commit 7be10f7bf5
4 changed files with 25 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
phpBB/includes/acp/acp_users.php
View file

@ -47,13 +47,7 @@ class acp_users
$user_ip = request_var('user_ip', ''); $user_ip = request_var('user_ip', '');
$domain = gethostbyaddr($user_ip); $domain = gethostbyaddr($user_ip);
$ipwhois = ''; $ipwhois = user_ipwhois($user_ip);
if ($ipwhois = user_ipwhois($user_ip))
{
$ipwhois = preg_replace('#(\s)([\w\-\._\+]+@[\w\-\.]+)(\s)#', '\1<a href="mailto:\2">\2</a>\3', $ipwhois);
$ipwhois = preg_replace('#(\s)(http:/{2}[^\s]*)(\s)#', '\1<a href="\2">\2</a>\3', $ipwhois);
}
$template->assign_vars(array( $template->assign_vars(array(
'MESSAGE_TITLE' => sprintf($user->lang['IP_WHOIS_FOR'], $domain), 'MESSAGE_TITLE' => sprintf($user->lang['IP_WHOIS_FOR'], $domain),

12
phpBB/includes/functions_user.php
View file

@ -1112,6 +1112,13 @@ function user_ipwhois($ip)
{ {
$ipwhois = ''; $ipwhois = '';
// Check IP
// Only supporting IPv4 at the moment...
if (empty($ip) || !preg_match(get_preg_expression('ipv4'), $ip))
{
return '';
}
$match = array( $match = array(
'#RIPE\.NET#is' => 'whois.ripe.net', '#RIPE\.NET#is' => 'whois.ripe.net',
'#whois\.apnic\.net#is' => 'whois.apnic.net', '#whois\.apnic\.net#is' => 'whois.apnic.net',
@ -1147,7 +1154,10 @@ function user_ipwhois($ip)
} }
} }
return $ipwhois; $ipwhois = htmlspecialchars($ipwhois);
// Magic URL ;)
return trim(make_clickable($ipwhois, false, ''));
} }
/** /**

12
phpBB/includes/mcp/mcp_post.php
View file

@ -36,20 +36,18 @@ function mcp_post_details($id, $mode, $action)
{ {
case 'whois': case 'whois':
if ($auth->acl_get('m_info', $post_info['forum_id']))
{
$ip = request_var('ip', ''); $ip = request_var('ip', '');
include($phpbb_root_path . 'includes/functions_user.' . $phpEx); 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)(ht{2}p:/{2}\S*)(\s)#', '\1<a href="\2">\2</a>\3', $whois);
$template->assign_vars(array( $template->assign_vars(array(
'RETURN_POST' => sprintf($user->lang['RETURN_POST'], '<a href="' . append_sid("{$phpbb_root_path}mcp.$phpEx", "i=$id&amp;mode=$mode&amp;p=$post_id") . '">', '</a>'), 'RETURN_POST' => sprintf($user->lang['RETURN_POST'], '<a href="' . append_sid("{$phpbb_root_path}mcp.$phpEx", "i=$id&amp;mode=$mode&amp;p=$post_id") . '">', '</a>'),
'U_RETURN_POST' => append_sid("{$phpbb_root_path}mcp.$phpEx", "i=$id&amp;mode=$mode&amp;p=$post_id"), 'U_RETURN_POST' => append_sid("{$phpbb_root_path}mcp.$phpEx", "i=$id&amp;mode=$mode&amp;p=$post_id"),
'L_RETURN_POST' => sprintf($user->lang['RETURN_POST'], '', ''), 'L_RETURN_POST' => sprintf($user->lang['RETURN_POST'], '', ''),
'WHOIS' => trim($whois)) 'WHOIS' => user_ipwhois($ip),
); ));
}
// We're done with the whois page so return // We're done with the whois page so return
return; return;

11
phpBB/viewonline.php
View file

@ -52,7 +52,7 @@ if (!isset($sort_key_text[$sort_key]))
$order_by = $sort_key_sql[$sort_key] . ' ' . (($sort_dir == 'a') ? 'ASC' : 'DESC'); $order_by = $sort_key_sql[$sort_key] . ' ' . (($sort_dir == 'a') ? 'ASC' : 'DESC');
// Whois requested // Whois requested
if ($mode == 'whois') if ($mode == 'whois' && $auth->acl_get('a_') && $session_id)
{ {
include($phpbb_root_path . 'includes/functions_user.' . $phpEx); include($phpbb_root_path . 'includes/functions_user.' . $phpEx);
@ -64,14 +64,7 @@ if ($mode == 'whois')
if ($row = $db->sql_fetchrow($result)) if ($row = $db->sql_fetchrow($result))
{ {
$whois = user_ipwhois($row['session_ip']); $template->assign_var('WHOIS', user_ipwhois($row['session_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">\2</a>\3', $whois);
$template->assign_vars(array(
'WHOIS' => trim($whois))
);
} }
$db->sql_freeresult($result); $db->sql_freeresult($result);