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

Various updates

Browse source 
git-svn-id: file:///svn/phpbb/trunk@3727 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Paul S. Owen 2003-03-25 16:50:18 +00:00
parent 3428964065
commit 75b1ffa664
1 changed files with 25 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
phpBB/memberlist.php
View file

@ -111,12 +111,12 @@ switch ($mode)
} }
// We left join on the session table to see if the user is currently online // We left join on the session table to see if the user is currently online
$sql = "SELECT username, user_id, user_permissions, user_viewemail, user_posts, user_regdate, user_rank, user_from, user_occ, user_interests, user_website, user_email, user_icq, user_aim, user_yim, user_msnm, user_avatar, user_avatar_type, user_allowavatar, user_lastvisit, MAX(session_time) AS session_time $sql = "SELECT username, user_id, user_colour, user_permissions, user_sig, user_viewemail, user_posts, user_regdate, user_rank, user_from, user_occ, user_interests, user_website, user_email, user_icq, user_aim, user_yim, user_msnm, user_avatar, user_avatar_type, user_allowavatar, user_lastvisit, MAX(session_time) AS session_time
FROM " . USERS_TABLE . " FROM " . USERS_TABLE . "
LEFT JOIN " . SESSIONS_TABLE . " ON session_user_id = user_id LEFT JOIN " . SESSIONS_TABLE . " ON session_user_id = user_id
WHERE user_id = $user_id WHERE user_id = $user_id
AND user_active = 1 AND user_active = 1
GROUP BY username, user_id, user_viewemail, user_posts, user_regdate, user_rank, user_from, user_occ, user_interests, user_website, user_email, user_icq, user_aim, user_yim, user_msnm, user_avatar, user_avatar_type, user_allowavatar, user_lastvisit"; GROUP BY username, user_id, user_colour, user_permissions, user_sig, user_viewemail, user_posts, user_regdate, user_rank, user_from, user_occ, user_interests, user_website, user_email, user_icq, user_aim, user_yim, user_msnm, user_avatar, user_avatar_type, user_allowavatar, user_lastvisit";
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
if (!($row = $db->sql_fetchrow($result))) if (!($row = $db->sql_fetchrow($result)))
@ -160,7 +160,6 @@ switch ($mode)
GROUP BY f.forum_id, f.forum_name GROUP BY f.forum_id, f.forum_name
ORDER BY num_posts DESC"; ORDER BY num_posts DESC";
$result = $db->sql_query_limit($sql, 1); $result = $db->sql_query_limit($sql, 1);
// AND f.forum_id NOT IN ()
$active_f_row = $db->sql_fetchrow($result); $active_f_row = $db->sql_fetchrow($result);
$db->sql_freeresult($result); $db->sql_freeresult($result);
@ -206,8 +205,6 @@ switch ($mode)
$template->assign_vars(show_profile($row)); $template->assign_vars(show_profile($row));
$template->assign_vars(array( $template->assign_vars(array(
'USER_PROFILE' => sprintf($user->lang['VIEWING_PROFILE'], $row['username']),
'POSTS_DAY' => sprintf($user->lang['POST_DAY'], $posts_per_day), 'POSTS_DAY' => sprintf($user->lang['POST_DAY'], $posts_per_day),
'POSTS_PCT' => sprintf($user->lang['POST_PCT'], $percentage), 'POSTS_PCT' => sprintf($user->lang['POST_PCT'], $percentage),
'ACTIVE_FORUM' => $active_f_name, 'ACTIVE_FORUM' => $active_f_name,
@ -254,6 +251,7 @@ switch ($mode)
{ {
trigger_error($$user->lang['NO_USER']); trigger_error($$user->lang['NO_USER']);
} }
$db->sql_freeresult($result);
// Can we send email to this user? // Can we send email to this user?
if (empty($row['user_viewemail']) && !$auth->acl_get('a_user')) if (empty($row['user_viewemail']) && !$auth->acl_get('a_user'))
@ -267,16 +265,12 @@ switch ($mode)
trigger_error($lang['FLOOD_EMAIL_LIMIT']); trigger_error($lang['FLOOD_EMAIL_LIMIT']);
} }
$username = $row['username'];
$user_email = $row['user_email'];
$user_lang = $row['user_lang'];
// User has submitted a message, handle it // User has submitted a message, handle it
if (isset($_POST['submit'])) if (isset($_POST['submit']))
{ {
$error = FALSE; $error = FALSE;
if (!empty($_POST['subject'])) if (isset($_POST['subject']) && trim($_POST['subject']) != '')
{ {
$subject = trim(stripslashes($_POST['subject'])); $subject = trim(stripslashes($_POST['subject']));
} }
@ -286,7 +280,7 @@ switch ($mode)
$error_msg = (!empty($error_msg)) ? $error_msg . '<br />' . $lang['EMPTY_SUBJECT_EMAIL'] : $lang['EMPTY_SUBJECT_EMAIL']; $error_msg = (!empty($error_msg)) ? $error_msg . '<br />' . $lang['EMPTY_SUBJECT_EMAIL'] : $lang['EMPTY_SUBJECT_EMAIL'];
} }
if (!empty($_POST['message'])) if (isset($_POST['message']) && trim($_POST['message']) != '')
{ {
$message = trim(stripslashes($_POST['message'])); $message = trim(stripslashes($_POST['message']));
} }
@ -304,31 +298,31 @@ switch ($mode)
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
include($phpbb_root_path . 'includes/emailer.'.$phpEx); include($phpbb_root_path . 'includes/emailer.'.$phpEx);
$emailer = new emailer($config['smtp_delivery']); $emailer = new emailer();
$email_headers = 'From: ' . $user->data['user_email'] . "\n"; $emailer->use_template('profile_send_email', $row['user_lang']);
$emailer->email_address($row['user_email']);
$emailer->set_subject($subject);
$email_headers = '';
if (!empty($_POST['cc_email'])) if (!empty($_POST['cc_email']))
{ {
$email_headers .= "Cc: " . $user->data['user_email'] . "\n"; $email_headers = "Cc: " . $user->data['user_email'] . "\n";
} }
$email_headers .= 'Return-Path: ' . $user->data['user_email'] . "\n";
$email_headers .= 'X-AntiAbuse: Board servername - ' . $server_name . "\n"; $email_headers .= 'X-AntiAbuse: Board servername - ' . $server_name . "\n";
$email_headers .= 'X-AntiAbuse: User_id - ' . $user->data['user_id'] . "\n"; $email_headers .= 'X-AntiAbuse: User_id - ' . $user->data['user_id'] . "\n";
$email_headers .= 'X-AntiAbuse: Username - ' . $user->data['username'] . "\n"; $email_headers .= 'X-AntiAbuse: Username - ' . $user->data['username'] . "\n";
$email_headers .= 'X-AntiAbuse: User IP - ' . $user->ip . "\r\n"; $email_headers .= 'X-AntiAbuse: User IP - ' . $user->ip . "\n";
$emailer->use_template('profile_send_email', $user_lang);
$emailer->email_address($user_email);
$emailer->set_subject($subject);
$emailer->extra_headers($email_headers); $emailer->extra_headers($email_headers);
$emailer->assign_vars(array( $emailer->assign_vars(array(
'SITENAME' => $config['sitename'], 'SITENAME' => $config['sitename'],
'BOARD_EMAIL' => $config['board_email'], 'BOARD_EMAIL' => $config['board_contact'],
'FROM_USERNAME' => $userdata['username'], 'FROM_USERNAME' => $user->data['username'],
'TO_USERNAME' => $username, 'TO_USERNAME' => $row['username'],
'MESSAGE' => $message) 'MESSAGE' => $message)
); );
$emailer->send(); $emailer->send();
$emailer->reset(); $emailer->reset();
@ -515,7 +509,7 @@ switch ($mode)
$db->sql_freeresult($result); $db->sql_freeresult($result);
// Do the SQL thang // Do the SQL thang
$sql = "SELECT username, user_id, user_viewemail, user_posts, user_regdate, user_rank, user_from, user_website, user_email, user_icq, user_aim, user_yim, user_msnm, user_avatar, user_avatar_type, user_allowavatar, user_lastvisit $sql = "SELECT username, user_id, user_colour, user_viewemail, user_posts, user_regdate, user_rank, user_from, user_website, user_email, user_sig, user_icq, user_aim, user_yim, user_msnm, user_avatar, user_avatar_type, user_allowavatar, user_lastvisit
FROM " . USERS_TABLE . " FROM " . USERS_TABLE . "
WHERE user_id <> " . ANONYMOUS . " WHERE user_id <> " . ANONYMOUS . "
$where_sql $where_sql
@ -680,15 +674,17 @@ function show_profile($data)
$last_visit = (!empty($data['session_time'])) ? $data['session_time'] : $data['user_lastvisit']; $last_visit = (!empty($data['session_time'])) ? $data['session_time'] : $data['user_lastvisit'];
$template_vars = array( $template_vars = array(
'USERNAME' => $username, 'USERNAME' => $username,
'ONLINE_IMG' => (intval($data['session_time']) >= time() - 300) ? '' : '', 'USER_COLOR' => (!empty($data['user_colour'])) ? $data['user_colour'] : '',
'AVATAR_IMG' => $poster_avatar,
'RANK_TITLE' => $rank_title, 'RANK_TITLE' => $rank_title,
'SIGNATURE' => (!empty($data['user_sig'])) ? $data['user_sig'] : '',
'ONLINE_IMG' => (intval($data['session_time']) >= time() - 300) ? $user->img('icon_online', $user->lang['USER_ONLINE']) : $user->img('icon_offline', $user->lang['USER_ONLINE']),
'AVATAR_IMG' => $poster_avatar,
'RANK_IMG' => $rank_img, 'RANK_IMG' => $rank_img,
'JOINED' => $user->format_date($data['user_regdate'], $user->lang['DATE_FORMAT']), 'JOINED' => $user->format_date($data['user_regdate'], $user->lang['DATE_FORMAT']),
'VISITED' => $user->format_date($last_visit, $user->lang['DATE_FORMAT']), 'VISITED' => (empty($last_visit)) ? ' - ' : $user->format_date($last_visit, $user->lang['DATE_FORMAT']),
'POSTS' => ($data['user_posts']) ? $data['user_posts'] : 0, 'POSTS' => ($data['user_posts']) ? $data['user_posts'] : 0,
'PM_IMG' => $pm_img, 'PM_IMG' => $pm_img,