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

Reintroduce setting of email subjects from source ... will only be used where an email template doesn't contain an appropriate subject line. Note this may lead to users having email subjects in a language other than that they selected.

Browse source 
git-svn-id: file:///svn/phpbb/branches/phpBB-2_0_0@3238 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Paul S. Owen 2002-12-22 16:01:16 +00:00
parent c9f34d9ba3
commit 485f127717
7 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
phpBB/groupcp.php
View file

@ -288,7 +288,7 @@ else if ( isset($HTTP_POST_VARS['joingroup']) && $group_id )
$emailer->use_template('group_request', $moderator['user_lang']); $emailer->use_template('group_request', $moderator['user_lang']);
$emailer->email_address($moderator['user_email']); $emailer->email_address($moderator['user_email']);
$emailer->set_subject();//$lang['Group_request'] $emailer->set_subject($lang['Group_request']);
$emailer->extra_headers($email_headers); $emailer->extra_headers($email_headers);
$emailer->assign_vars(array( $emailer->assign_vars(array(
@ -576,7 +576,7 @@ else if ( $group_id )
$emailer->use_template('group_added', $row['user_lang']); $emailer->use_template('group_added', $row['user_lang']);
$emailer->email_address($row['user_email']); $emailer->email_address($row['user_email']);
$emailer->set_subject();//$lang['Group_added'] $emailer->set_subject($lang['Group_added']);
$emailer->extra_headers($email_headers); $emailer->extra_headers($email_headers);
$emailer->assign_vars(array( $emailer->assign_vars(array(
@ -731,7 +731,7 @@ else if ( $group_id )
$emailer->use_template('group_approved'); $emailer->use_template('group_approved');
$emailer->email_address(' ');//$userdata['user_email'] $emailer->email_address(' ');//$userdata['user_email']
$emailer->set_subject();//$lang['Group_approved'] $emailer->set_subject($lang['Group_approved']);
$emailer->extra_headers($email_headers); $emailer->extra_headers($email_headers);
$emailer->assign_vars(array( $emailer->assign_vars(array(

2
phpBB/includes/emailer.php
View file

@ -157,7 +157,7 @@ class emailer
$match = array(); $match = array();
if (preg_match('#^(Subject:(.*?))$#m', $this->msg, $match)) if (preg_match('#^(Subject:(.*?))$#m', $this->msg, $match))
{ {
$this->subject = ($this->subject != '') ? $this->subject : trim($match[2]); $this->subject = (trim($match[2]) != '') ? trim($match[2]) : (($this->subject != '') ? $this->subject : 'No Subject');
$drop_header .= '[\r\n]*?' . $match[1]; $drop_header .= '[\r\n]*?' . $match[1];
} }

6
phpBB/includes/functions_post.php
View file

@ -670,7 +670,11 @@ function user_notification($mode, &$post_data, &$topic_title, &$forum_id, &$topi
{ {
$emailer->use_template('topic_notify', $user_lang); $emailer->use_template('topic_notify', $user_lang);
$emailer->email_address(' '); $emailer->email_address(' ');
$emailer->set_subject(); // The Topic_reply_notification lang string below will be used
// if for some reason the mail template subject cannot be read
// ... note it will not necessarily be in the posters own language!
$emailer->set_subject($lang['Topic_reply_notification']);
$emailer->extra_headers($email_headers . "Bcc: $bcc_list\n"); $emailer->extra_headers($email_headers . "Bcc: $bcc_list\n");
// This is a nasty kludge to remove the username var ... till (if?) // This is a nasty kludge to remove the username var ... till (if?)

2
phpBB/includes/usercp_activate.php
View file

@ -66,7 +66,7 @@ if ( $row = $db->sql_fetchrow($result) )
$emailer->use_template('admin_welcome_activated', $row['user_lang']); $emailer->use_template('admin_welcome_activated', $row['user_lang']);
$emailer->email_address($row['user_email']); $emailer->email_address($row['user_email']);
$emailer->set_subject();//$lang['Account_activated_subject'] $emailer->set_subject($lang['Account_activated_subject']);
$emailer->extra_headers($email_headers); $emailer->extra_headers($email_headers);
$emailer->assign_vars(array( $emailer->assign_vars(array(

6
phpBB/includes/usercp_register.php
View file

@ -468,7 +468,7 @@ if ( isset($HTTP_POST_VARS['submit']) )
$emailer->use_template('user_activate', stripslashes($user_lang)); $emailer->use_template('user_activate', stripslashes($user_lang));
$emailer->email_address($email); $emailer->email_address($email);
$emailer->set_subject();//$lang['Reactivate'] $emailer->set_subject($lang['Reactivate']);
$emailer->extra_headers($email_headers); $emailer->extra_headers($email_headers);
$emailer->assign_vars(array( $emailer->assign_vars(array(
@ -576,7 +576,7 @@ if ( isset($HTTP_POST_VARS['submit']) )
$emailer->use_template($email_template, stripslashes($user_lang)); $emailer->use_template($email_template, stripslashes($user_lang));
$emailer->email_address($email); $emailer->email_address($email);
$emailer->set_subject();//sprintf($lang['Welcome_subject'], $board_config['sitename']) $emailer->set_subject(sprintf($lang['Welcome_subject'], $board_config['sitename']));
$emailer->extra_headers($email_headers); $emailer->extra_headers($email_headers);
if( $coppa ) if( $coppa )
@ -622,7 +622,7 @@ if ( isset($HTTP_POST_VARS['submit']) )
//$emailer->use_template("admin_activate", stripslashes($user_lang)); //$emailer->use_template("admin_activate", stripslashes($user_lang));
$emailer->use_template("admin_activate", $board_config['default_lang']); $emailer->use_template("admin_activate", $board_config['default_lang']);
$emailer->email_address($board_config['board_email']); $emailer->email_address($board_config['board_email']);
$emailer->set_subject(); //$lang['New_account_subject'] $emailer->set_subject($lang['New_account_subject']);
$emailer->extra_headers($email_headers); $emailer->extra_headers($email_headers);
$emailer->assign_vars(array( $emailer->assign_vars(array(

2
phpBB/includes/usercp_sendpasswd.php
View file

@ -75,7 +75,7 @@ if ( isset($HTTP_POST_VARS['submit']) )
$emailer->use_template('user_activate_passwd', $row['user_lang']); $emailer->use_template('user_activate_passwd', $row['user_lang']);
$emailer->email_address($row['user_email']); $emailer->email_address($row['user_email']);
$emailer->set_subject();//$lang['New_password_activation'] $emailer->set_subject($lang['New_password_activation']);
$emailer->extra_headers($email_headers); $emailer->extra_headers($email_headers);
$emailer->assign_vars(array( $emailer->assign_vars(array(

2
phpBB/privmsg.php
View file

@ -1324,7 +1324,7 @@ else if ( $submit || $refresh || $mode != '' )
$emailer->use_template('privmsg_notify', $to_userdata['user_lang']); $emailer->use_template('privmsg_notify', $to_userdata['user_lang']);
$emailer->extra_headers($email_headers); $emailer->extra_headers($email_headers);
$emailer->email_address($to_userdata['user_email']); $emailer->email_address($to_userdata['user_email']);
$emailer->set_subject(); //$lang['Notification_subject'] $emailer->set_subject($lang['Notification_subject']);
$emailer->assign_vars(array( $emailer->assign_vars(array(
'USERNAME' => $to_username, 'USERNAME' => $to_username,