mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-06 08:47:45 +02:00
Code Issues Releases Wiki Activity

some small changes to mailing again (to better cope with invalid email addresses)

Browse Source 
git-svn-id: file:///svn/phpbb/trunk@4805 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen
2004-02-07 11:00:27 +00:00
parent 742f5d4a18
commit 719c572ca9
4 changed files with 32 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
phpBB/adm/admin_email.php
View File

@@ -120,28 +120,21 @@ if (isset($_POST['submit']))
// Send the messages
include_once($phpbb_root_path . 'includes/functions_messenger.'.$phpEx);
$messenger = new messenger($use_queue);
$errored = false;
for ($i = 0; $i < sizeof($email_list); $i++)
{
$used_lang = $email_list[$i][0]['lang'];
$used_method = $email_list[$i][0]['method'];
if (sizeof($email_list[$i]) == 1)
for ($j = 0; $j < sizeof($email_list[$i]); $j++)
{
$messenger->to($email_list[$i][0]['email'], $email_list[$i][0]['name']);
$messenger->im($email_list[$i][0]['jabber'], $email_list[$i][0]['name']);
}
else
{
for ($j = 0; $j < sizeof($email_list[$i]); $j++)
{
$email_row = $email_list[$i][$j];
$email_row = $email_list[$i][$j];
$messenger->bcc($email_row['email'], $email_row['name']);
$messenger->im($email_row['jabber'], $email_row['name']);
}
$messenger->{((sizeof($email_list[$i]) == 1) ? 'to' : 'bcc')}($email_row['email'], $email_row['name']);
$messenger->im($email_row['jabber'], $email_row['name']);
}
$messenger->template('admin_send_email', $used_lang);
@@ -161,7 +154,10 @@ if (isset($_POST['submit']))
'MESSAGE' => $message)
);
$messenger->send($used_method, $log_session);
if (!($messenger->send($used_method, $log_session)))
{
$errored = true;
}
}
unset($email_list);
@@ -189,7 +185,8 @@ if (isset($_POST['submit']))
}
add_log('admin', 'LOG_MASS_EMAIL', $group_name);
trigger_error($user->lang['EMAIL_SENT']);
$message = (!$errored) ? $user->lang['EMAIL_SENT'] : sprintf($user->lang['EMAIL_SEND_ERROR'], '<a href="admin_viewlogs.' . $phpEx . $SID . '&amp;mode=critical" class="gen">', '</a>');
trigger_error($message);
}
}