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

[ticket/11454] Use set_addresses in other applicable areas

Browse source 
This should fix some other bugs that may not have yet been recognized--some
areas only set to(), but sent according to user_notify_type, which is not
necessarily email.

PHPBB3-11454
This commit is contained in:
Nathan Guse 2013-04-24 15:34:12 -05:00
parent ebb5169a46
commit fcdfe748b8
10 changed files with 13 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
phpBB/includes/acp/acp_inactive.php
View file

@ -115,7 +115,7 @@ class acp_inactive
{ {
$messenger->template('admin_welcome_activated', $row['user_lang']); $messenger->template('admin_welcome_activated', $row['user_lang']);
$messenger->to($row['user_email'], $row['username']); $messenger->set_addresses($row);
$messenger->anti_abuse_headers($config, $user); $messenger->anti_abuse_headers($config, $user);
@ -203,8 +203,7 @@ class acp_inactive
{ {
$messenger->template('user_remind_inactive', $row['user_lang']); $messenger->template('user_remind_inactive', $row['user_lang']);
$messenger->to($row['user_email'], $row['username']); $messenger->set_addresses($row);
$messenger->im($row['user_jabber'], $row['username']);
$messenger->anti_abuse_headers($config, $user); $messenger->anti_abuse_headers($config, $user);

4
phpBB/includes/acp/acp_users.php
View file

@ -347,7 +347,7 @@ class acp_users
$messenger->template($email_template, $user_row['user_lang']); $messenger->template($email_template, $user_row['user_lang']);
$messenger->to($user_row['user_email'], $user_row['username']); $messenger->set_addresses($user_row);
$messenger->anti_abuse_headers($config, $user); $messenger->anti_abuse_headers($config, $user);
@ -402,7 +402,7 @@ class acp_users
$messenger->template('admin_welcome_activated', $user_row['user_lang']); $messenger->template('admin_welcome_activated', $user_row['user_lang']);
$messenger->to($user_row['user_email'], $user_row['username']); $messenger->set_addresses($user_row);
$messenger->anti_abuse_headers($config, $user); $messenger->anti_abuse_headers($config, $user);

3
phpBB/includes/functions_user.php
View file

@ -2924,8 +2924,7 @@ function group_user_attributes($action, $group_id, $user_id_ary = false, $userna
{ {
$messenger->template('group_approved', $row['user_lang']); $messenger->template('group_approved', $row['user_lang']);
$messenger->to($row['user_email'], $row['username']); $messenger->set_addresses($row);
$messenger->im($row['user_jabber'], $row['username']);
$messenger->assign_vars(array( $messenger->assign_vars(array(
'USERNAME' => htmlspecialchars_decode($row['username']), 'USERNAME' => htmlspecialchars_decode($row['username']),

2
phpBB/includes/ucp/ucp_activate.php
View file

@ -114,7 +114,7 @@ class ucp_activate
$messenger->template('admin_welcome_activated', $user_row['user_lang']); $messenger->template('admin_welcome_activated', $user_row['user_lang']);
$messenger->to($user_row['user_email'], $user_row['username']); $messenger->set_addresses($user_row);
$messenger->anti_abuse_headers($config, $user); $messenger->anti_abuse_headers($config, $user);

3
phpBB/includes/ucp/ucp_groups.php
View file

@ -212,8 +212,7 @@ class ucp_groups
{ {
$messenger->template('group_request', $row['user_lang']); $messenger->template('group_request', $row['user_lang']);
$messenger->to($row['user_email'], $row['username']); $messenger->set_addresses($row);
$messenger->im($row['user_jabber'], $row['username']);
$messenger->assign_vars(array( $messenger->assign_vars(array(
'USERNAME' => htmlspecialchars_decode($row['username']), 'USERNAME' => htmlspecialchars_decode($row['username']),

3
phpBB/includes/ucp/ucp_profile.php
View file

@ -175,8 +175,7 @@ class ucp_profile
while ($row = $db->sql_fetchrow($result)) while ($row = $db->sql_fetchrow($result))
{ {
$messenger->template('admin_activate', $row['user_lang']); $messenger->template('admin_activate', $row['user_lang']);
$messenger->to($row['user_email'], $row['username']); $messenger->set_addresses($row);
$messenger->im($row['user_jabber'], $row['username']);
$messenger->assign_vars(array( $messenger->assign_vars(array(
'USERNAME' => htmlspecialchars_decode($data['username']), 'USERNAME' => htmlspecialchars_decode($data['username']),

3
phpBB/includes/ucp/ucp_register.php
View file

@ -384,8 +384,7 @@ class ucp_register
while ($row = $db->sql_fetchrow($result)) while ($row = $db->sql_fetchrow($result))
{ {
$messenger->template('admin_activate', $row['user_lang']); $messenger->template('admin_activate', $row['user_lang']);
$messenger->to($row['user_email'], $row['username']); $messenger->set_addresses($row);
$messenger->im($row['user_jabber'], $row['username']);
$messenger->assign_vars(array( $messenger->assign_vars(array(
'USERNAME' => htmlspecialchars_decode($data['username']), 'USERNAME' => htmlspecialchars_decode($data['username']),

3
phpBB/includes/ucp/ucp_remind.php
View file

@ -94,8 +94,7 @@ class ucp_remind
$messenger->template('user_activate_passwd', $user_row['user_lang']); $messenger->template('user_activate_passwd', $user_row['user_lang']);
$messenger->to($user_row['user_email'], $user_row['username']); $messenger->set_addresses($user_row);
$messenger->im($user_row['user_jabber'], $user_row['username']);
$messenger->assign_vars(array( $messenger->assign_vars(array(
'USERNAME' => htmlspecialchars_decode($user_row['username']), 'USERNAME' => htmlspecialchars_decode($user_row['username']),

5
phpBB/includes/ucp/ucp_resend.php
View file

@ -91,7 +91,7 @@ class ucp_resend
if ($config['require_activation'] == USER_ACTIVATION_SELF || $coppa) if ($config['require_activation'] == USER_ACTIVATION_SELF || $coppa)
{ {
$messenger->template(($coppa) ? 'coppa_resend_inactive' : 'user_resend_inactive', $user_row['user_lang']); $messenger->template(($coppa) ? 'coppa_resend_inactive' : 'user_resend_inactive', $user_row['user_lang']);
$messenger->to($user_row['user_email'], $user_row['username']); $messenger->set_addresses($user_row);
$messenger->anti_abuse_headers($config, $user); $messenger->anti_abuse_headers($config, $user);
@ -126,8 +126,7 @@ class ucp_resend
while ($row = $db->sql_fetchrow($result)) while ($row = $db->sql_fetchrow($result))
{ {
$messenger->template('admin_activate', $row['user_lang']); $messenger->template('admin_activate', $row['user_lang']);
$messenger->to($row['user_email'], $row['username']); $messenger->set_addresses($row);
$messenger->im($row['user_jabber'], $row['username']);
$messenger->anti_abuse_headers($config, $user); $messenger->anti_abuse_headers($config, $user);

2
phpBB/memberlist.php
View file

@ -376,7 +376,7 @@ switch ($mode)
$messenger->subject(htmlspecialchars_decode($subject)); $messenger->subject(htmlspecialchars_decode($subject));
$messenger->replyto($user->data['user_email']); $messenger->replyto($user->data['user_email']);
$messenger->im($row['user_jabber'], $row['username']); $messenger->set_addresses($row);
$messenger->assign_vars(array( $messenger->assign_vars(array(
'BOARD_CONTACT' => $config['board_contact'], 'BOARD_CONTACT' => $config['board_contact'],