From 3d1731b7cc10657440546197e14640b9e41fab32 Mon Sep 17 00:00:00 2001 From: "Paul S. Owen" Date: Sun, 12 Oct 2003 12:37:25 +0000 Subject: [PATCH] Mass email messenger updates, can mass email selected users git-svn-id: file:///svn/phpbb/trunk@4580 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/adm/admin_email.php | 98 +++++++++++++++----------------- phpBB/language/en/lang_admin.php | 6 +- 2 files changed, 52 insertions(+), 52 deletions(-) diff --git a/phpBB/adm/admin_email.php b/phpBB/adm/admin_email.php index e8006ea78f..43b530795b 100644 --- a/phpBB/adm/admin_email.php +++ b/phpBB/adm/admin_email.php @@ -36,39 +36,39 @@ $message = $subject = $group_id = ''; // Do the job ... if (isset($_POST['submit'])) { - // Increase maximum execution time in case of a lot of users, but don't complain - // about it if it isn't allowed. - @set_time_limit(1200); - // Error checking needs to go here ... if no subject and/or no message then skip // over the send and return to the form - $group_id = request_var('g', 0); - $subject = preg_replace('#&(\#[0-9]+;)#', '&\1', request_var('subject', '')); - $message = (isset($_POST['message'])) ? htmlspecialchars(trim(str_replace(array('\\\'', '\\"', '\\0', '\\\\'), array('\'', '"', '\0', '\\'), $_POST['message']))) : ''; - $message = preg_replace('#&(\#[0-9]+;)#', '&\1', $message); + $group_id = request_var('g', 0); + $usernames = request_var('usernames', ''); + $subject = preg_replace('#&(\#[0-9]+;)#', '&\1', strtr(request_var('subject', ''), array_flip(get_html_translation_table(HTML_ENTITIES)))); + $message = preg_replace('#&(\#[0-9]+;)#', '&\1', strtr(request_var('message', ''), array_flip(get_html_translation_table(HTML_ENTITIES)))); $error = array(); - if ($subject == '') + if (!$subject) { $error[] = $user->lang['NO_EMAIL_SUBJECT']; } - if ($message == '') + if (!$message) { $error[] = $user->lang['NO_EMAIL_MESSAGE']; } if (!sizeof($error)) { - $sql = ($group_id) ? 'SELECT u.user_email, u.username, u.user_lang - FROM ' . USERS_TABLE . ' u, ' . USER_GROUP_TABLE . " ug - WHERE ug.group_id = $group_id - AND ug.user_pending <> 1 - AND u.user_id = ug.user_id - AND u.user_allow_massemail = 1" : - 'SELECT user_email - FROM ' . USERS_TABLE . ' - WHERE user_allow_massemail = 1'; + if ($usernames) + { + $usernames = implode(', ', preg_replace('#^[\s]*?(.*?)[\s]*?$#e', "\"'\" . \$db->sql_escape('\\1') . \"'\"", explode("\n", $usernames))); + + $sql = 'SELECT username, user_email, user_jabber, user_notify_type, user_lang + FROM ' . USERS_TABLE . ' + WHERE username IN (' . $usernames . ') + AND user_allow_massemail = 1'; + } + else + { + $sql = ($group_id) ? 'SELECT u.user_email, u.username, u.user_lang, u.user_jabber, u.user_notify_type FROM ' . USERS_TABLE . ' u, ' . USER_GROUP_TABLE . " ug WHERE ug.group_id = $group_id AND ug.user_pending <> 1 AND u.user_id = ug.user_id AND u.user_allow_massemail = 1" : 'SELECT username, user_email, user_jabber, user_notify_type, user_lang FROM ' . USERS_TABLE . ' WHERE user_allow_massemail = 1'; + } $result = $db->sql_query($sql); if (!($row = $db->sql_fetchrow($result))) @@ -81,56 +81,48 @@ if (isset($_POST['submit'])) $email_list = array(); do { + $email_list[$row['user_lang']][$i]['method'] = $row['user_notify_type']; $email_list[$row['user_lang']][$i]['email'] = $row['user_email']; $email_list[$row['user_lang']][$i]['name'] = $row['username']; + $email_list[$row['user_lang']][$i]['jabber'] = $row['user_jabber']; $i++; } while ($row = $db->sql_fetchrow($result)); $db->sql_freeresult($result); + // Send the messages + include_once($phpbb_root_path . 'includes/functions_messenger.'.$phpEx); - // Let's do some checking to make sure that mass mail functions are working in win32 versions of php. - if (preg_match('#^[c-z]:\\\#i', getenv('PATH')) && !$config['smtp_delivery'] && phpversion() < '4.3') - { - // We are running on windows, force delivery to use our smtp functions since - // php's are broken by default - $config['smtp_delivery'] = 1; - $config['smtp_host'] = @ini_get('SMTP'); - } - - - include($phpbb_root_path . 'includes/emailer.'.$phpEx); - $emailer = new emailer(true); - - $extra_headers = 'X-AntiAbuse: Board servername - ' . $config['server_name'] . "\n"; - $extra_headers .= 'X-AntiAbuse: User_id - ' . $user->data['user_id'] . "\n"; - $extra_headers .= 'X-AntiAbuse: Username - ' . $user->data['username'] . "\n"; - $extra_headers .= 'X-AntiAbuse: User IP - ' . $user->ip . "\n"; + $messenger = new messenger(); foreach ($email_list as $lang => $to_ary) { foreach ($to_ary as $to) { - $emailer->template('admin_send_email', $lang); + $messenger->template('admin_send_email', $lang); - $emailer->subject($subject); - $emailer->headers($extra_headers); + $messenger->headers('X-AntiAbuse: Board servername - ' . $config['server_name']); + $messenger->headers('X-AntiAbuse: User_id - ' . $user->data['user_id']); + $messenger->headers('X-AntiAbuse: Username - ' . $user->data['username']); + $messenger->headers('X-AntiAbuse: User IP - ' . $user->ip); - $emailer->replyto($config['board_email']); - $emailer->to($to['email'], $to['name']); + $messenger->subject($subject); + $messenger->headers($extra_headers); - $emailer->assign_vars(array( + $messenger->replyto($config['board_email']); + $messenger->to($to['email'], $to['name']); + + $messenger->assign_vars(array( 'SITENAME' => $config['sitename'], 'CONTACT_EMAIL' => $config['board_contact'], 'MESSAGE' => $message) ); - $emailer->send(); - $emailer->reset(); + $messenger->send($to['method']); } } - $emailer->mail_queue->save(); + $messenger->queue->save(); unset($email_list); if ($group_id) @@ -182,7 +174,7 @@ adm_page_header($user->lang['MASS_EMAIL']);

lang['MASS_EMAIL_EXPLAIN']; ?>

-
+" name="email">
@@ -201,16 +193,20 @@ adm_page_header($user->lang['MASS_EMAIL']); ?> - - + + - + + + + + - + + diff --git a/phpBB/language/en/lang_admin.php b/phpBB/language/en/lang_admin.php index e0a9acccdc..bc6b3e9bcf 100644 --- a/phpBB/language/en/lang_admin.php +++ b/phpBB/language/en/lang_admin.php @@ -1080,7 +1080,11 @@ $lang += array( $lang += array( 'MASS_EMAIL_EXPLAIN' => 'Here you can email a message to either all of your users, or all users of a specific group. To do this, an email will be sent out to the administrative email address supplied, with a blind carbon copy sent to all recipients. If you are emailing a large group of people please be patient after submitting and do not stop the page halfway through. It is normal for a mass emailing to take a long time, you will be notified when the script has completed', 'COMPOSE' => 'Compose', - 'RECIPIENTS' => 'Recipients', + 'SEND_TO_GROUP' => 'Send to group', + 'SEND_TO_USERS' => 'Send to users', + 'SEND_TO_USERS_EXPLAIN' => 'Entering names here will override any group selected above. Enter each username on a new line.', + 'MASS_MESSAGE' => 'Your message', + 'MASS_MESSAGE_EXPLAIN' => 'Please note that you may enter only plain text. All markup will be removed before sending.', 'ALL_USERS' => 'All Users', 'NO_EMAIL_SUBJECT' => 'You must specify a subject for your message.', 'NO_EMAIL_MESSAGE' => 'You must enter a message.',
lang['COMPOSE']; ?>
lang['RECIPIENTS']; ?>lang['SEND_TO_GROUP']; ?>:
lang['SUBJECT']; ?>lang['SEND_TO_USERS']; ?>:
lang['SEND_TO_USERS_EXPLAIN']; ?>
[ &mode=searchuser&form=email&field=usernames', '_phpbbsearch', 'HEIGHT=500,resizable=yes,scrollbars=yes,WIDTH=740');return false;">lang['FIND_USERNAME']; ?> ]
lang['SUBJECT']; ?>:
lang['MESSAGE']; ?> - lang['MASS_MESSAGE']; ?>:
lang['MASS_MESSAGE_EXPLAIN']; ?>