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

some updates, email related.

Browse source 
git-svn-id: file:///svn/phpbb/trunk@4070 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen 2003-06-01 11:29:29 +00:00
parent 0e96aa60c2
commit 0c101c3dd4
6 changed files with 95 additions and 79 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
phpBB/adm/admin_board.php
View file

@ -479,6 +479,10 @@ switch ($mode)
<td class="row1"><?php echo $user->lang['BOARD_EMAIL_FORM']; ?>: <br /><span class="gensmall"><?php echo $user->lang['BOARD_EMAIL_FORM_EXPLAIN']; ?></span></td> <td class="row1"><?php echo $user->lang['BOARD_EMAIL_FORM']; ?>: <br /><span class="gensmall"><?php echo $user->lang['BOARD_EMAIL_FORM_EXPLAIN']; ?></span></td>
<td class="row2"><input type="radio" name="board_email_form" value="1" <?php echo $board_email_form_yes; ?> /> <?php echo $user->lang['ENABLED']; ?>&nbsp;&nbsp;<input type="radio" name="board_email_form" value="0" <?php echo $board_email_form_no; ?> /> <?php echo $user->lang['DISABLED']; ?></td> <td class="row2"><input type="radio" name="board_email_form" value="1" <?php echo $board_email_form_yes; ?> /> <?php echo $user->lang['ENABLED']; ?>&nbsp;&nbsp;<input type="radio" name="board_email_form" value="0" <?php echo $board_email_form_no; ?> /> <?php echo $user->lang['DISABLED']; ?></td>
</tr> </tr>
<tr>
<td class="row1" width="50%"><?php echo $user->lang['EMAIL_PACKAGE_SIZE']; ?>: <br /><span class="gensmall"><?php echo $user->lang['EMAIL_PACKAGE_SIZE_EXPLAIN']; ?></span></td>
<td class="row2"><input class="post" type="text" size="5" maxlength="5" name="email_package_size" value="<?php echo $new['email_package_size']; ?>" /></td>
</tr>
<tr> <tr>
<td class="row1" width="50%"><?php echo $user->lang['CONTACT_EMAIL']; ?>: <br /><span class="gensmall"><?php echo $user->lang['CONTACT_EMAIL_EXPLAIN']; ?></span></td> <td class="row1" width="50%"><?php echo $user->lang['CONTACT_EMAIL']; ?>: <br /><span class="gensmall"><?php echo $user->lang['CONTACT_EMAIL_EXPLAIN']; ?></span></td>
<td class="row2"><input class="post" type="text" size="25" maxlength="100" name="board_contact" value="<?php echo $new['board_contact']; ?>" /></td> <td class="row2"><input class="post" type="text" size="25" maxlength="100" name="board_contact" value="<?php echo $new['board_contact']; ?>" /></td>

122
phpBB/adm/admin_email.php
View file

@ -21,13 +21,8 @@
if (!empty($setmodules)) if (!empty($setmodules))
{ {
if (!$auth->acl_get('a_email')) $file = basename(__FILE__);
{ $module['GENERAL']['MASS_EMAIL'] = ($auth->acl_get('a_email')) ? "$file$SID" : '';
return;
}
$module['GENERAL']['MASS_EMAIL'] = basename(__FILE__) . $SID;
return; return;
} }
@ -43,52 +38,54 @@ if (!$auth->acl_get('a_email'))
trigger_error($user->lang['NO_ADMIN']); trigger_error($user->lang['NO_ADMIN']);
} }
//
// Set some vars // Set some vars
//
$message = ''; $message = '';
$subject = ''; $subject = '';
//
// Do the job ... // Do the job ...
//
if (isset($_POST['submit'])) 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 // Increase maximum execution time in case of a lot of users, but don't complain about it if it isn't
// allowed. // allowed.
//
@set_time_limit(1200); @set_time_limit(1200);
$group_id = intval($_POST['g']); $group_id = intval($_POST['g']);
$sql = ($group_id != -1) ? "SELECT u.user_email FROM " . USERS_TABLE . " u, " . USER_GROUP_TABLE . " ug WHERE ug.group_id = $group_id AND ug.user_pending <> " . TRUE . " AND u.user_id = ug.user_id" : "SELECT user_email FROM " . USERS_TABLE; if ($group_id > 0)
{
$sql = 'SELECT u.user_email, u.username, u.user_lang
FROM ' . USERS_TABLE . ' u, ' . USER_GROUP_TABLE . " ug
WHERE ug.group_id = $group_id
AND g.user_pending <> " . TRUE . "
AND u.user_id = ug.user_id";
}
else
{
$sql = 'SELECT user_email FROM ' . USERS_TABLE;
}
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
if (!($email_list = $db->sql_fetchrowset($g_result))) $subject = stripslashes(trim($_POST['subject']));
$message = stripslashes(trim($_POST['message']));
if (!($row = $db->sql_fetchrow($result)))
{ {
//
// Output a relevant GENERAL_MESSAGE about users/group // Output a relevant GENERAL_MESSAGE about users/group
// not existing // not existing
// trigger_error($user->lang['GROUP_DOES_NOT_EXIST']);
} }
$subject = stripslashes($_POST['subject']);
$message = stripslashes($_POST['message']);
//
// Error checking needs to go here ... if no subject and/or // Error checking needs to go here ... if no subject and/or
// no message then skip over the send and return to the form // no message then skip over the send and return to the form
//
$error = FALSE;
if (!$error)
if ($subject != '' && $message != '')
{ {
include($phpbb_root_path . 'includes/emailer.'.$phpEx); include($phpbb_root_path . 'includes/emailer.'.$phpEx);
//
// Let's do some checking to make sure that mass mail functions // Let's do some checking to make sure that mass mail functions
// are working in win32 versions of php. // are working in win32 versions of php.
//
if (preg_match('/[c-z]:\\\.*/i', getenv('PATH')) && !$config['smtp_delivery']) if (preg_match('/[c-z]:\\\.*/i', getenv('PATH')) && !$config['smtp_delivery'])
{ {
// We are running on windows, force delivery to use // We are running on windows, force delivery to use
@ -96,50 +93,60 @@ if (isset($_POST['submit']))
$config['smtp_delivery'] = 1; $config['smtp_delivery'] = 1;
$config['smtp_host'] = get_cfg_var('SMTP'); $config['smtp_host'] = get_cfg_var('SMTP');
} }
$emailer = new emailer($config['smtp_delivery']); $emailer = new emailer(true);
$email_headers = 'From: ' . $config['board_email'] . "\n"; $extra_headers = 'X-AntiAbuse: Board servername - ' . $config['server_name'] . "\r\n";
$extra_headers .= 'X-AntiAbuse: User_id - ' . $user->data['user_id'] . "\r\n";
$extra_headers .= 'X-AntiAbuse: Username - ' . $user->data['username'] . "\r\n";
$extra_headers .= 'X-AntiAbuse: User IP - ' . $user->ip . "\r\n";
$bcc_list = ''; $email_list = array();
for($i = 0; $i < count($email_list); $i++) $count = 0;
do
{ {
$bcc_list .= (($bcc_list != '') ? ', ' : '') . $email_list[$i]['user_email']; $email_list[$count]['email'] = $row['user_email'];
$email_list[$count]['name'] = $row['username'];
$email_list[$count]['lang'] = $row['user_lang'];
$count++;
} }
$email_headers .= "Bcc: $bcc_list\n"; while ($row = $db->sql_fetchrow($result));
$db->sql_freeresult($result);
$email_headers .= 'Return-Path: ' . $userdata['board_email'] . "\n"; foreach ($email_list as $addr)
$email_headers .= 'X-AntiAbuse: Board servername - ' . $server_name . "\n"; {
$email_headers .= 'X-AntiAbuse: User_id - ' . $userdata['user_id'] . "\n"; $emailer->template('admin_send_email', $addr['lang']);
$email_headers .= 'X-AntiAbuse: Username - ' . $userdata['username'] . "\n";
$email_headers .= 'X-AntiAbuse: User IP - ' . $user_ip . "\n"; $emailer->subject($subject);
$emailer->headers($extra_headers);
$emailer->replyto($config['board_email']);
$emailer->to($addr['email'], $addr['name']);
$emailer->use_template('admin_send_email');
$emailer->email_address($config['board_email']);
$emailer->set_subject($subject);
$emailer->extra_headers($email_headers);
$emailer->assign_vars(array( $emailer->assign_vars(array(
'SITENAME' => $config['sitename'], 'SITENAME' => $config['sitename'],
'BOARD_EMAIL' => $config['board_email'], 'CONTACT_EMAIL' => $config['board_contact'],
'MESSAGE' => $message) 'MESSAGE' => $message)
); );
$emailer->send(); $emailer->send();
$emailer->reset(); $emailer->reset();
}
message_die(MESSAGE, $user->lang['Email_sent']); $emailer->queue->save();
unset($email_list);
add_log('admin', 'LOG_MASS_EMAIL');
trigger_error($user->lang['EMAIL_SENT'], E_USER_NOTICE);
} }
} }
//
// Initial selection // Initial selection
// $sql = 'SELECT group_id, group_name
FROM ' . GROUPS_TABLE;
$sql = "SELECT group_id, group_name
FROM ".GROUPS_TABLE;
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
$select_list = '<select name = "g"><option value = "-1">' . $user->lang['All_users'] . '</option>'; $select_list = '<select name="g"><option value="-1">' . $user->lang['ALL_USERS'] . '</option>';
if ($row = $db->sql_fetchrow($result)) if ($row = $db->sql_fetchrow($result))
{ {
do do
@ -150,32 +157,33 @@ if ($row = $db->sql_fetchrow($result))
} }
$select_list .= '</select>'; $select_list .= '</select>';
adm_page_header($user->lang['Mass_Email']); adm_page_header($user->lang['MASS_EMAIL']);
?> ?>
<h1><?php echo $user->lang['Mass_Email']; ?></h1> <h1><?php echo $user->lang['MASS_EMAIL']; ?></h1>
<p><?php echo $user->lang['Mass_email_explain']; ?></p> <p><?php echo $user->lang['MASS_EMAIL_EXPLAIN']; ?></p>
<form method="post" action="admin_mass_email.<?php echo $phpEx.$SID; ?>"><table cellspacing="1" cellpadding="4" border="0" align="center" bgcolor="#98AAB1"> <form method="post" action="admin_email.<?php echo $phpEx.$SID; ?>">
<table class="bg" cellspacing="1" cellpadding="4" border="0" align="center">
<tr> <tr>
<th colspan="2"><?php echo $user->lang['Compose']; ?></th> <th colspan="2"><?php echo $user->lang['COMPOSE']; ?></th>
</tr> </tr>
<tr> <tr>
<td class="row1" align="right"><b><?php echo $user->lang['Recipients']; ?></b></td> <td class="row1" align="right"><b><?php echo $user->lang['RECIPIENTS']; ?></b></td>
<td class="row2" align="left"><?php echo $select_list; ?></td> <td class="row2" align="left"><?php echo $select_list; ?></td>
</tr> </tr>
<tr> <tr>
<td class="row1" align="right"><b><?php echo $user->lang['Subject']; ?></b></td> <td class="row1" align="right"><b><?php echo $user->lang['SUBJECT']; ?></b></td>
<td class="row2"><span class="gen"><input type="text" name="subject" size="45" maxlength="100" tabindex="2" class="post" value="<?php echo $subject; ?>" /></span></td> <td class="row2"><span class="gen"><input type="text" name="subject" size="45" maxlength="100" tabindex="2" class="post" value="<?php echo $subject; ?>" /></span></td>
</tr> </tr>
<tr> <tr>
<td class="row1" align="right" valign="top"><span class="gen"><b><?php echo $user->lang['Message']; ?></b></span> <td class="row1" align="right" valign="top"><span class="gen"><b><?php echo $user->lang['MESSAGE']; ?></b></span>
<td class="row2"><textarea class="post" name="message" rows="15" cols="35" wrap="virtual" style="width:450px" tabindex="3"><?php echo $message; ?></textarea></td> <td class="row2"><textarea class="post" name="message" rows="15" cols="35" wrap="virtual" style="width:450px" tabindex="3"><?php echo $message; ?></textarea></td>
</tr> </tr>
<tr> <tr>
<td class="cat" colspan="2" align="center"><input type="submit" value="<?php echo $user->lang['Email']; ?>" name="submit" class="mainoption" /></td> <td class="cat" colspan="2" align="center"><input type="submit" value="<?php echo $user->lang['EMAIL']; ?>" name="submit" class="mainoption" /></td>
</tr> </tr>
</table></form> </table></form>

8
phpBB/includes/emailer.php
View file

@ -30,11 +30,13 @@ class emailer
function emailer($use_queue = false) function emailer($use_queue = false)
{ {
global $config;
$this->use_queue = $use_queue; $this->use_queue = $use_queue;
if ($use_queue) if ($use_queue)
{ {
$this->queue = new Queue(); $this->queue = new Queue();
$this->queue->init('emailer', 100); $this->queue->init('emailer', $config['email_package_size']);
} }
$this->reset(); $this->reset();
} }
@ -472,7 +474,7 @@ class Queue
} }
//--TEMP //--TEMP
function queue_filled() function is_queue_filled()
{ {
if (file_exists($this->cache_file)) if (file_exists($this->cache_file))
{ {
@ -579,7 +581,7 @@ class Queue
$sql = "UPDATE " . CONFIG_TABLE . " $sql = "UPDATE " . CONFIG_TABLE . "
SET config_value = '" . time() . "' SET config_value = '" . time() . "'
WHERE config_name = 'last_queue_run'"; WHERE config_name = 'last_queue_run'";
$db->sql_query(); $db->sql_query($sql);
} }
function save() function save()

1
phpBB/install/schemas/mysql_basic.sql
View file

@ -83,6 +83,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('display_last_edite
INSERT INTO phpbb_config (config_name, config_value) VALUES ('board_email_sig','Thanks, The Management'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('board_email_sig','Thanks, The Management');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('board_email','address@yourdomain.tld'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('board_email','address@yourdomain.tld');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('board_contact','contact@yourdomain.tld'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('board_contact','contact@yourdomain.tld');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('email_package_size','50');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('smtp_delivery','0'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('smtp_delivery','0');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('smtp_host',''); INSERT INTO phpbb_config (config_name, config_value) VALUES ('smtp_host','');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('smtp_port','25'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('smtp_port','25');

2
phpBB/language/en/email/admin_send_email.txt
View file

@ -2,7 +2,7 @@ Charset: iso-8859-1
The following is an email sent to you by an administrator of "{SITENAME}". If this message is spam, contains abusive or other comments you find offensive please contact the webmaster of the board at the following address: The following is an email sent to you by an administrator of "{SITENAME}". If this message is spam, contains abusive or other comments you find offensive please contact the webmaster of the board at the following address:
{BOARD_EMAIL} {CONTACT_EMAIL}
Include this full email (particularly the headers). Include this full email (particularly the headers).

13
phpBB/language/en/lang_admin.php
View file

@ -95,7 +95,7 @@ $lang = array_merge($lang, array(
'log_index_activate' => '<b>Activated inactive users</b><br />%s users', 'log_index_activate' => '<b>Activated inactive users</b><br />%s users',
'log_index_delete' => '<b>Deleted inactive users</b><br />%s', 'log_index_delete' => '<b>Deleted inactive users</b><br />%s',
'LOG_INDEX_REMIND' => '<b>Sent reminder emails to inactive users</b><br />%s', 'LOG_INDEX_REMIND' => '<b>Sent reminder emails to inactive users</b><br />%s',
'log_mass_email' => '<b>Sent mass email</b><br />%s', 'LOG_MASS_EMAIL' => '<b>Sent mass email</b><br />%s',
'log_delete_word' => '<b>Deleted word censor</b>', 'log_delete_word' => '<b>Deleted word censor</b>',
'log_edit_word' => '<b>Edited word censor</b><br />%s', 'log_edit_word' => '<b>Edited word censor</b><br />%s',
'log_add_word' => '<b>Added word censor</b><br />%s', 'log_add_word' => '<b>Added word censor</b><br />%s',
@ -507,6 +507,8 @@ $lang = array_merge($lang, array(
'ENABLE_EMAIL_EXPLAIN' => 'If this is set to disabled no emails will be sent by the board at all.', 'ENABLE_EMAIL_EXPLAIN' => 'If this is set to disabled no emails will be sent by the board at all.',
'BOARD_EMAIL_FORM' => 'Users send email via board', 'BOARD_EMAIL_FORM' => 'Users send email via board',
'BOARD_EMAIL_FORM_EXPLAIN' => 'This function keeps email addresses completely private.', 'BOARD_EMAIL_FORM_EXPLAIN' => 'This function keeps email addresses completely private.',
'EMAIL_PACKAGE_SIZE' => 'Email Package Size',
'EMAIL_PACKAGE_SIZE_EXPLAIN' => 'This is the number of emails sent in one package.',
'ADMIN_EMAIL' => 'Return Email Address', 'ADMIN_EMAIL' => 'Return Email Address',
'ADMIN_EMAIL_EXPLAIN' => 'This will be used as the return address on all emails.', 'ADMIN_EMAIL_EXPLAIN' => 'This will be used as the return address on all emails.',
'EMAIL_SIG' => 'Email Signature', 'EMAIL_SIG' => 'Email Signature',
@ -839,11 +841,10 @@ $lang = array_merge($lang, array(
'WORD_REMOVED' => 'The selected word censor has been successfully removed', 'WORD_REMOVED' => 'The selected word censor has been successfully removed',
'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', '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', 'COMPOSE' => 'Compose',
'Recipients' => 'Recipients', 'RECIPIENTS' => 'Recipients',
'All_users' => 'All Users', 'ALL_USERS' => 'All Users',
'Email_successfull' => 'Your message has been sent',
'RANKS_EXPLAIN' => 'Using this form you can add, edit, view and delete ranks. You can also create custom ranks which can be applied to a user via the user management facility', 'RANKS_EXPLAIN' => 'Using this form you can add, edit, view and delete ranks. You can also create custom ranks which can be applied to a user via the user management facility',