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

Fix bug #487951 but mass email needs some other additions, notes are in file ...

Browse source 
git-svn-id: file:///svn/phpbb/trunk@1498 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Paul S. Owen 2001-12-03 00:11:18 +00:00
parent 6432e3dd27
commit 5fc368388f
2 changed files with 76 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

134
phpBB/admin/admin_mass_email.php
View file

@ -19,17 +19,12 @@
* *
***************************************************************************/ ***************************************************************************/
/***************************************************************************
Mass Mailings can be used by admin to mail either the entire board or
all members of a specific group.
***************************************************************************/
if($setmodules == 1) if($setmodules == 1)
{ {
$filename = basename(__FILE__); $filename = basename(__FILE__);
$module['General']['Mass_Email'] = $filename; $module['General']['Mass_Email'] = $filename;
return; return;
} }
// //
@ -45,12 +40,12 @@ require('pagestart.inc');
// //
@set_time_limit(1200); @set_time_limit(1200);
// $message = "";
// Set form names $subject = "";
//
$f_title = 'e_title';
$f_msg = 'e_msg';
//
// Do the job ...
//
if( isset($HTTP_POST_VARS['submit']) ) if( isset($HTTP_POST_VARS['submit']) )
{ {
$group_id = intval($HTTP_POST_VARS[POST_GROUPS_URL]); $group_id = intval($HTTP_POST_VARS[POST_GROUPS_URL]);
@ -58,9 +53,10 @@ if( isset($HTTP_POST_VARS['submit']) )
if( $group_id != -1 ) if( $group_id != -1 )
{ {
$sql = "SELECT u.user_email $sql = "SELECT u.user_email
FROM " . USERS_TABLE . " u, " . USER_GROUP_TABLE . " g FROM " . USERS_TABLE . " u, " . USER_GROUP_TABLE . " ug
WHERE u.user_id = g.user_id WHERE ug.group_id = $group_id
AND g.group_id = $group_id"; AND ug.user_pending <> " . TRUE . "
AND u.user_id = ug.user_id";
} }
else else
{ {
@ -72,54 +68,71 @@ if( isset($HTTP_POST_VARS['submit']) )
{ {
message_die(GENERAL_ERROR, "Coult not select group members!", __LINE__, __FILE__, $sql); message_die(GENERAL_ERROR, "Coult not select group members!", __LINE__, __FILE__, $sql);
} }
if( !$db->sql_numrows($result) )
{
//
// Output a relevant GENERAL_MESSAGE about users/group
// not existing
//
}
$email_list = $db->sql_fetchrowset($g_result); $email_list = $db->sql_fetchrowset($g_result);
$subject = stripslashes($HTTP_POST_VARS["$f_title"]); $subject = stripslashes($HTTP_POST_VARS["subject"]);
$message = stripslashes($HTTP_POST_VARS["$f_msg"]); $message = stripslashes($HTTP_POST_VARS["message"]);
include($phpbb_root_path . 'includes/emailer.'.$phpEx); //
$emailer = new emailer($board_config['smtp_delivery']); // Error checking needs to go here ... if no subject and/or
// no message then skip over the send and return to the form
//
$error = FALSE;
$email_headers = "From: " . $board_config['board_email'] . "\n"; if( !$error )
$bcc_list = "";
for($i = 0; $i < count($email_list); $i++)
{ {
if( $bcc_list != "" ) include($phpbb_root_path . 'includes/emailer.'.$phpEx);
$emailer = new emailer($board_config['smtp_delivery']);
$email_headers = "From: " . $board_config['board_email'] . "\n";
$bcc_list = "";
for($i = 0; $i < count($email_list); $i++)
{ {
$bcc_list .= ", "; if( $bcc_list != "" )
{
$bcc_list .= ", ";
}
$bcc_list .= $email_list[$i]['user_email'];
} }
$bcc_list .= $email_list[$i]['user_email']; $email_headers .= "Bcc: $bcc_list\n";
$email_headers .= "Return-Path: " . $userdata['board_email'] . "\n";
$email_headers .= "X-AntiAbuse: Board servername - " . $server_name . "\n";
$email_headers .= "X-AntiAbuse: User_id - " . $userdata['user_id'] . "\n";
$email_headers .= "X-AntiAbuse: Username - " . $userdata['username'] . "\n";
$email_headers .= "X-AntiAbuse: User IP - " . decode_ip($user_ip) . "\r\n";
$emailer->use_template("admin_send_email");
$emailer->email_address($board_config['board_email']);
$emailer->set_subject($subject);
$emailer->extra_headers($email_headers);
$emailer->assign_vars(array(
"SITENAME" => $board_config['sitename'],
"BOARD_EMAIL" => $board_config['board_email'],
"MESSAGE" => $message)
);
$emailer->send();
$emailer->reset();
$template->assign_vars(array(
"META" => '<meta http-equiv="refresh" content="5;url=' . append_sid("index.$phpEx") . '">')
);
$message = $lang['Email_sent'] . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>");
message_die(GENERAL_MESSAGE, $message);
} }
$email_headers .= "Bcc: $bcc_list\n";
$email_headers .= "Return-Path: " . $userdata['board_email'] . "\n";
$email_headers .= "X-AntiAbuse: Board servername - " . $server_name . "\n";
$email_headers .= "X-AntiAbuse: User_id - " . $userdata['user_id'] . "\n";
$email_headers .= "X-AntiAbuse: Username - " . $userdata['username'] . "\n";
$email_headers .= "X-AntiAbuse: User IP - " . decode_ip($user_ip) . "\r\n";
$emailer->use_template("admin_send_email");
$emailer->email_address($board_config['board_email']);
$emailer->set_subject($subject);
$emailer->extra_headers($email_headers);
$emailer->assign_vars(array(
"SITENAME" => $board_config['sitename'],
"BOARD_EMAIL" => $board_config['board_email'],
"MESSAGE" => $message)
);
$emailer->send();
$emailer->reset();
$template->assign_vars(array(
"META" => '<meta http-equiv="refresh" content="5;url=' . append_sid("index.$phpEx") . '">')
);
$message = $lang['Email_sent'] . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>");
message_die(GENERAL_MESSAGE, $message);
} }
// //
@ -152,6 +165,9 @@ $template->set_filenames(array(
); );
$template->assign_vars(array( $template->assign_vars(array(
"MESSAGE" => $message,
"SUBJECT" => $subject,
"L_EMAIL_TITLE" => $lang['Email'], "L_EMAIL_TITLE" => $lang['Email'],
"L_EMAIL_EXPLAIN" => $lang['Mass_email_explain'], "L_EMAIL_EXPLAIN" => $lang['Mass_email_explain'],
"L_COMPOSE" => $lang['Compose'], "L_COMPOSE" => $lang['Compose'],
@ -162,9 +178,7 @@ $template->assign_vars(array(
"L_NOTICE" => $notice, "L_NOTICE" => $notice,
"S_USER_ACTION" => append_sid('admin_mass_email.'.$phpEx), "S_USER_ACTION" => append_sid('admin_mass_email.'.$phpEx),
"S_GROUP_SELECT" => $select_list, "S_GROUP_SELECT" => $select_list)
"S_EMAIL_SUBJECT" => $f_title,
"S_EMAIL_MSG" => $f_msg)
); );
$template->pparse('body'); $template->pparse('body');

4
phpBB/templates/subSilver/admin/user_email_body.tpl
View file

@ -13,11 +13,11 @@
</tr> </tr>
<tr> <tr>
<td class="row1" align="right"><b>{L_EMAIL_SUBJECT}</b></td> <td class="row1" align="right"><b>{L_EMAIL_SUBJECT}</b></td>
<td class="row2"><span class="gen"><input type="text" name="{S_EMAIL_SUBJECT}" size="45" maxlength="100" style="width:450px" tabindex="2" class="post" /></span></td> <td class="row2"><span class="gen"><input type="text" name="subject" size="45" maxlength="100" tabindex="2" class="post" value="{SUBJECT}" /></span></td>
</tr> </tr>
<tr> <tr>
<td class="row1" align="right" valign="top"> <span class="gen"><b>{L_EMAIL_MSG}</b></span> <td class="row1" align="right" valign="top"> <span class="gen"><b>{L_EMAIL_MSG}</b></span>
<td class="row2"><span class="gen"> <textarea name="{S_EMAIL_MSG}" rows="15" cols="35" wrap="virtual" style="width:450px" tabindex="3" class="post"></textarea></span> <td class="row2"><span class="gen"> <textarea name="message" rows="15" cols="35" wrap="virtual" style="width:450px" tabindex="3" class="post">{MESSAGE}</textarea></span>
</tr> </tr>
<tr> <tr>
<td class="catBottom" align="center" colspan="2"><input type="submit" value="{L_EMAIL}" name="submit" class="mainoption" /></td> <td class="catBottom" align="center" colspan="2"><input type="submit" value="{L_EMAIL}" name="submit" class="mainoption" /></td>