diff options
| author | the_systech <the_systech@users.sourceforge.net> | 2002-01-29 16:01:04 +0000 |
|---|---|---|
| committer | the_systech <the_systech@users.sourceforge.net> | 2002-01-29 16:01:04 +0000 |
| commit | 982d341892d3547fe4c37860ff89b2a8a357570a (patch) | |
| tree | 5ee6dcc7c00e09f1a46baa576c4874330fe0d54b /phpBB | |
| parent | 0c95dffd8a45ed4bb6a6238cf22a1e434db3093f (diff) | |
| download | forums-982d341892d3547fe4c37860ff89b2a8a357570a.tar forums-982d341892d3547fe4c37860ff89b2a8a357570a.tar.gz forums-982d341892d3547fe4c37860ff89b2a8a357570a.tar.bz2 forums-982d341892d3547fe4c37860ff89b2a8a357570a.tar.xz forums-982d341892d3547fe4c37860ff89b2a8a357570a.zip | |
Hopefully some fixes for the mass email bugs on win32 Systems... We'll Know soon :D
git-svn-id: file:///svn/phpbb/trunk@2011 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/admin/admin_mass_email.php | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/phpBB/admin/admin_mass_email.php b/phpBB/admin/admin_mass_email.php index 40ba94594a..b9b707a406 100644 --- a/phpBB/admin/admin_mass_email.php +++ b/phpBB/admin/admin_mass_email.php @@ -91,8 +91,19 @@ if( isset($HTTP_POST_VARS['submit']) ) if( !$error ) { include($phpbb_root_path . 'includes/emailer.'.$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')) && !$board_config['smtp_delivery']) + { + // We are running on windows, force delivery to use + // our smtp functions since php's are broken by default + $board_config['smtp_delivery'] = 1; + $board_config['smtp_host'] = get_cfg_var('SMTP'); + } $emailer = new emailer($board_config['smtp_delivery']); - + $email_headers = "From: " . $board_config['board_email'] . "\n"; $bcc_list = ""; @@ -181,4 +192,4 @@ $template->pparse('body'); include('page_footer_admin.'.$phpEx); -?>
\ No newline at end of file +?> |