diff options
| author | Paul S. Owen <psotfx@users.sourceforge.net> | 2004-02-08 16:08:52 +0000 |
|---|---|---|
| committer | Paul S. Owen <psotfx@users.sourceforge.net> | 2004-02-08 16:08:52 +0000 |
| commit | 1f8ee8517ce67680660ce5f539eb372f4e64129f (patch) | |
| tree | 6485de893fcf10fa6e66551066f94fb1e43adbee /phpBB/viewonline.php | |
| parent | 75d49924d880e9448faed30fa0fbdcb634e90308 (diff) | |
| download | forums-1f8ee8517ce67680660ce5f539eb372f4e64129f.tar forums-1f8ee8517ce67680660ce5f539eb372f4e64129f.tar.gz forums-1f8ee8517ce67680660ce5f539eb372f4e64129f.tar.bz2 forums-1f8ee8517ce67680660ce5f539eb372f4e64129f.tar.xz forums-1f8ee8517ce67680660ce5f539eb372f4e64129f.zip | |
Move ipwhois ... it's used exclusively for "user" activities, makes more sense there
git-svn-id: file:///svn/phpbb/trunk@4816 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/viewonline.php')
| -rw-r--r-- | phpBB/viewonline.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/phpBB/viewonline.php b/phpBB/viewonline.php index 778e9f889e..a00ca8bc00 100644 --- a/phpBB/viewonline.php +++ b/phpBB/viewonline.php @@ -37,7 +37,7 @@ $order_by = $sort_key_sql[$sort_key] . ' ' . (($sort_dir == 'a') ? 'ASC' : 'DESC // Whois requested if ($mode == 'whois') { - include($phpbb_root_path.'includes/functions_admin.'.$phpEx); + include($phpbb_root_path.'includes/functions_user.'.$phpEx); $sql = 'SELECT u.user_id, u.username, u.user_type, s.session_ip FROM ' . USERS_TABLE . ' u, ' . SESSIONS_TABLE . " s @@ -47,7 +47,8 @@ if ($mode == 'whois') if ($row = $db->sql_fetchrow($result)) { - $whois = ipwhois($row['session_ip']); + $whois = user_ipwhois($row['session_ip']); + $whois = preg_replace('#(\s+?)([\w\-\._\+]+?@[\w\-\.]+?)(\s+?)#s', '\1<a href="mailto:\2">\2</a>\3', $whois); $whois = preg_replace('#(\s+?)(http://.*?)(\s+?)#s', '\1<a href="\2" target="_blank">\2</a>\3', $whois); |