Menu
▾
▴
[Phpbb-checkins] CVS: phpBB2/admin admin_mass_email.php,1.15,1.15.2.1
|
From: Paul S. O. <ps...@us...> - 2002-04-07 08:08:34
|
Update of /cvsroot/phpbb/phpBB2/admin
In directory usw-pr-cvs1:/tmp/cvs-serv1073/admin
Modified Files:
Tag: phpBB-2_0_0
admin_mass_email.php
Log Message:
Minor changes
Index: admin_mass_email.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_mass_email.php,v
retrieving revision 1.15
retrieving revision 1.15.2.1
diff -C2 -r1.15 -r1.15.2.1
*** admin_mass_email.php 2 Apr 2002 21:13:47 -0000 1.15
--- admin_mass_email.php 7 Apr 2002 00:51:47 -0000 1.15.2.1
***************
*** 34,38 ****
//
$no_page_header = TRUE;
! $phpbb_root_path = "../";
require($phpbb_root_path . 'extension.inc');
require('pagestart.' . $phpEx);
--- 34,38 ----
//
$no_page_header = TRUE;
! $phpbb_root_path = '../';
require($phpbb_root_path . 'extension.inc');
require('pagestart.' . $phpEx);
***************
*** 44,49 ****
@set_time_limit(1200);
! $message = "";
! $subject = "";
//
--- 44,49 ----
@set_time_limit(1200);
! $message = '';
! $subject = '';
//
***************
*** 67,76 ****
FROM " . USERS_TABLE;
}
!
! if( !$result = $db->sql_query($sql) )
{
! message_die(GENERAL_ERROR, "Coult not select group members!", __LINE__, __FILE__, $sql);
}
if( !$db->sql_numrows($result) )
{
--- 67,79 ----
FROM " . USERS_TABLE;
}
! if( !($result = $db->sql_query($sql)) )
{
! message_die(GENERAL_ERROR, 'Could not select group members', '', __LINE__, __FILE__, $sql);
}
+
+
+
+
if( !$db->sql_numrows($result) )
{
***************
*** 82,88 ****
$email_list = $db->sql_fetchrowset($g_result);
! $subject = stripslashes($HTTP_POST_VARS["subject"]);
! $message = stripslashes($HTTP_POST_VARS["message"]);
//
--- 85,95 ----
$email_list = $db->sql_fetchrowset($g_result);
+
+
+
!
! $subject = stripslashes($HTTP_POST_VARS['subject']);
! $message = stripslashes($HTTP_POST_VARS['message']);
//
***************
*** 108,131 ****
$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++)
{
! if( $bcc_list != "" )
! {
! $bcc_list .= ", ";
! }
! $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);
--- 115,134 ----
$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 .= ( ( $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);
***************
*** 133,144 ****
$emailer->assign_vars(array(
! "SITENAME" => $board_config['sitename'],
! "BOARD_EMAIL" => $board_config['board_email'],
! "MESSAGE" => $message)
);
$emailer->send();
$emailer->reset();
! $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);
--- 136,147 ----
$emailer->assign_vars(array(
! 'SITENAME' => $board_config['sitename'],
! 'BOARD_EMAIL' => $board_config['board_email'],
! 'MESSAGE' => $message)
);
$emailer->send();
$emailer->reset();
! $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);
***************
*** 153,168 ****
FROM ".GROUPS_TABLE . "
WHERE group_single_user <> 1";
! $g_result = $db->sql_query($sql);
! $group_list = $db->sql_fetchrowset($g_result);
!
! $select_list = '<select name = "' . POST_GROUPS_URL . '">';
! $select_list .= '<option value = "-1">' . $lang['All_users'] . '</option>';
! for($i = 0;$i < count($group_list); $i++)
{
! $select_list .= "<option value = \"" . $group_list[$i]['group_id'];
! $select_list .= "\">" . $group_list[$i]['group_name'] . "</option>";
}
! $select_list .= "</select>";
//
--- 156,174 ----
FROM ".GROUPS_TABLE . "
WHERE group_single_user <> 1";
! if ( !($result = $db->sql_query($sql)) )
! {
! message_die(GENERAL_ERROR, 'Could not obtain list of groups', '', __LINE__, __FILE__, $sql);
! }
! $select_list = '<select name = "' . POST_GROUPS_URL . '"><option value = "-1">' . $lang['All_users'] . '</option>';
! if ( $row = $db->sql_fetchrow($result) )
{
! do
! {
! $select_list .= '<option value = "' . $row['group_id'] . '">' . $row['group_name'] . '</option>';
! }
! while ( $row = $db->sql_fetchrow($result) );
}
! $select_list .= '</select>';
//
***************
*** 172,193 ****
$template->set_filenames(array(
! "body" => "admin/user_email_body.tpl")
);
$template->assign_vars(array(
! "MESSAGE" => $message,
! "SUBJECT" => $subject,
! "L_EMAIL_TITLE" => $lang['Email'],
! "L_EMAIL_EXPLAIN" => $lang['Mass_email_explain'],
! "L_COMPOSE" => $lang['Compose'],
! "L_RECIPIENTS" => $lang['Recipients'],
! "L_EMAIL_SUBJECT" => $lang['Subject'],
! "L_EMAIL_MSG" => $lang['Message'],
! "L_EMAIL" => $lang['Email'],
! "L_NOTICE" => $notice,
! "S_USER_ACTION" => append_sid('admin_mass_email.'.$phpEx),
! "S_GROUP_SELECT" => $select_list)
);
--- 178,199 ----
$template->set_filenames(array(
! 'body' => 'admin/user_email_body.tpl')
);
$template->assign_vars(array(
! 'MESSAGE' => $message,
! 'SUBJECT' => $subject,
! 'L_EMAIL_TITLE' => $lang['Email'],
! 'L_EMAIL_EXPLAIN' => $lang['Mass_email_explain'],
! 'L_COMPOSE' => $lang['Compose'],
! 'L_RECIPIENTS' => $lang['Recipients'],
! 'L_EMAIL_SUBJECT' => $lang['Subject'],
! 'L_EMAIL_MSG' => $lang['Message'],
! 'L_EMAIL' => $lang['Email'],
! 'L_NOTICE' => $notice,
! 'S_USER_ACTION' => append_sid('admin_mass_email.'.$phpEx),
! 'S_GROUP_SELECT' => $select_list)
);
***************
*** 196,198 ****
include('page_footer_admin.'.$phpEx);
! ?>
--- 202,204 ----
include('page_footer_admin.'.$phpEx);
! ?>
\ No newline at end of file
|
