aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions_user.php
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2007-09-21 15:05:04 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2007-09-21 15:05:04 +0000
commit7be10f7bf532d6b137f86a7b73d00922ab099687 (patch)
treeb80d3798869c7b814e6bde4013e1cd6231996829 /phpBB/includes/functions_user.php
parent69d29e9282e0fcdbcac0017acea8aaa942ee2623 (diff)
downloadforums-7be10f7bf532d6b137f86a7b73d00922ab099687.tar
forums-7be10f7bf532d6b137f86a7b73d00922ab099687.tar.gz
forums-7be10f7bf532d6b137f86a7b73d00922ab099687.tar.bz2
forums-7be10f7bf532d6b137f86a7b73d00922ab099687.tar.xz
forums-7be10f7bf532d6b137f86a7b73d00922ab099687.zip
#i51 - #i63 - #i64
git-svn-id: file:///svn/phpbb/trunk@8095 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions_user.php')
-rw-r--r--phpBB/includes/functions_user.php12
1 files changed, 11 insertions, 1 deletions
diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php
index 86113899c7..fd077a796a 100644
--- a/phpBB/includes/functions_user.php
+++ b/phpBB/includes/functions_user.php
@@ -1112,6 +1112,13 @@ function user_ipwhois($ip)
{
$ipwhois = '';
+ // Check IP
+ // Only supporting IPv4 at the moment...
+ if (empty($ip) || !preg_match(get_preg_expression('ipv4'), $ip))
+ {
+ return '';
+ }
+
$match = array(
'#RIPE\.NET#is' => 'whois.ripe.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, ''));
}
/**