diff options
author | Meik Sievertsen <acydburn@phpbb.com> | 2007-03-30 14:24:55 +0000 |
---|---|---|
committer | Meik Sievertsen <acydburn@phpbb.com> | 2007-03-30 14:24:55 +0000 |
commit | efcb1279f06d1016c25fae516158abdb895981ee (patch) | |
tree | d2132ac5293103c1434c7f17133c7df453e45e78 /phpBB/memberlist.php | |
parent | 9f82dec04b18813c060e5a090a149c1a2c140689 (diff) | |
download | forums-efcb1279f06d1016c25fae516158abdb895981ee.tar forums-efcb1279f06d1016c25fae516158abdb895981ee.tar.gz forums-efcb1279f06d1016c25fae516158abdb895981ee.tar.bz2 forums-efcb1279f06d1016c25fae516158abdb895981ee.tar.xz forums-efcb1279f06d1016c25fae516158abdb895981ee.zip |
other fixes...
git-svn-id: file:///svn/phpbb/trunk@7242 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/memberlist.php')
-rw-r--r-- | phpBB/memberlist.php | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php index 697d5df2d3..6c3a02ac42 100644 --- a/phpBB/memberlist.php +++ b/phpBB/memberlist.php @@ -264,6 +264,11 @@ switch ($mode) $page_title = $user->lang['IM_USER']; $template_html = 'memberlist_im.html'; + if (!$auth->acl_get('u_sendim')) + { + trigger_error('NOT_AUTHORISED'); + } + $presence_img = ''; switch ($action) { @@ -1496,12 +1501,19 @@ function show_profile($data) 'U_EMAIL' => $email, 'U_WWW' => (!empty($data['user_website'])) ? $data['user_website'] : '', 'U_ICQ' => ($data['user_icq']) ? 'http://www.icq.com/people/webmsg.php?to=' . $data['user_icq'] : '', - 'U_AIM' => ($data['user_aim']) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=contact&action=aim&u=' . $user_id) : '', + 'U_AIM' => ($data['user_aim'] && $auth->acl_get('u_sendim')) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=contact&action=aim&u=' . $user_id) : '', 'U_YIM' => ($data['user_yim']) ? 'http://edit.yahoo.com/config/send_webmesg?.target=' . $data['user_yim'] . '&.src=pg' : '', - 'U_MSN' => ($data['user_msnm']) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=contact&action=msnm&u=' . $user_id) : '', - 'U_JABBER' => ($data['user_jabber']) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=contact&action=jabber&u=' . $user_id) : '', + 'U_MSN' => ($data['user_msnm'] && $auth->acl_get('u_sendim')) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=contact&action=msnm&u=' . $user_id) : '', + 'U_JABBER' => ($data['user_jabber'] && $auth->acl_get('u_sendim')) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=contact&action=jabber&u=' . $user_id) : '', 'LOCATION' => ($data['user_from']) ? $data['user_from'] : '', - + + 'USER_ICQ' => $data['user_icq'], + 'USER_AIM' => $data['user_aim'], + 'USER_YIM' => $data['user_yim'], + 'USER_MSN' => $data['user_msnm'], + 'USER_JABBER' => $data['user_jabber'], + 'USER_JABBER_IMG' => ($data['user_jabber']) ? $user->img('icon_contact_jabber', $data['user_jabber']) : '', + 'L_VIEWING_PROFILE' => sprintf($user->lang['VIEWING_PROFILE'], $username), ); } |