aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2014-07-16 21:54:14 +0200
committerJoas Schilling <nickvergessen@gmx.de>2014-07-16 21:54:14 +0200
commit99b60a2f5eda5be038943f9632f34a959c84dafe (patch)
tree0fd25e2389994ad65492521973e28aa15bdc07d5 /phpBB
parent9a369a9e1424be9109ea686cb24c7407b79c2067 (diff)
parenta22549f2477533e5efc1bb7038428e5982f0ccf2 (diff)
downloadforums-99b60a2f5eda5be038943f9632f34a959c84dafe.tar
forums-99b60a2f5eda5be038943f9632f34a959c84dafe.tar.gz
forums-99b60a2f5eda5be038943f9632f34a959c84dafe.tar.bz2
forums-99b60a2f5eda5be038943f9632f34a959c84dafe.tar.xz
forums-99b60a2f5eda5be038943f9632f34a959c84dafe.zip
Merge pull request #2741 from PayBas/ticket/12837
[ticket/12837] Detect "viewing contact admin page" on viewonline * PayBas/ticket/12837: [ticket/12837] Use else if instead of elseif [ticket/12837] Detect "viewing contact admin page" on viewonline
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/language/en/common.php1
-rw-r--r--phpBB/viewonline.php15
2 files changed, 15 insertions, 1 deletions
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 5af3ad4fbc..a58aec43cd 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -821,6 +821,7 @@ $lang = array_merge($lang, array(
1 => 'Viewed %d time',
2 => 'Viewed %d times',
),
+ 'VIEWING_CONTACT_ADMIN' => 'Viewing contact page',
'VIEWING_FAQ' => 'Viewing FAQ',
'VIEWING_MEMBERS' => 'Viewing member details',
'VIEWING_ONLINE' => 'Viewing who is online',
diff --git a/phpBB/viewonline.php b/phpBB/viewonline.php
index 4c897c58aa..a03a81a15e 100644
--- a/phpBB/viewonline.php
+++ b/phpBB/viewonline.php
@@ -295,8 +295,21 @@ while ($row = $db->sql_fetchrow($result))
break;
case 'memberlist':
- $location = (strpos($row['session_page'], 'mode=viewprofile') !== false) ? $user->lang['VIEWING_MEMBER_PROFILE'] : $user->lang['VIEWING_MEMBERS'];
$location_url = append_sid("{$phpbb_root_path}memberlist.$phpEx");
+
+ if (strpos($row['session_page'], 'mode=viewprofile') !== false)
+ {
+ $location = $user->lang['VIEWING_MEMBER_PROFILE'];
+ }
+ else if (strpos($row['session_page'], 'mode=contactadmin') !== false)
+ {
+ $location = $user->lang['VIEWING_CONTACT_ADMIN'];
+ $location_url = append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=contactadmin');
+ }
+ else
+ {
+ $location = $user->lang['VIEWING_MEMBERS'];
+ }
break;
case 'mcp':