diff options
| author | Paul S. Owen <psotfx@users.sourceforge.net> | 2002-10-30 00:57:27 +0000 |
|---|---|---|
| committer | Paul S. Owen <psotfx@users.sourceforge.net> | 2002-10-30 00:57:27 +0000 |
| commit | 691f50ada9386a63c53a473a44b835a8b1ca5978 (patch) | |
| tree | be18990bb0ae925485bc4785b15f648ca8cb2e9d /phpBB/includes/emailer.php | |
| parent | 9075298051fca5bc78713f455fc58d99e677e77a (diff) | |
| download | forums-691f50ada9386a63c53a473a44b835a8b1ca5978.tar forums-691f50ada9386a63c53a473a44b835a8b1ca5978.tar.gz forums-691f50ada9386a63c53a473a44b835a8b1ca5978.tar.bz2 forums-691f50ada9386a63c53a473a44b835a8b1ca5978.tar.xz forums-691f50ada9386a63c53a473a44b835a8b1ca5978.zip | |
Changed $board_config to $config, more posting "stuff", altered polling code in viewtopic and loads of new problems, poor coding, etc. created :)
git-svn-id: file:///svn/phpbb/trunk@2983 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/emailer.php')
| -rwxr-xr-x | phpBB/includes/emailer.php | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/phpBB/includes/emailer.php b/phpBB/includes/emailer.php index cabe89b944..f8a06cc91b 100755 --- a/phpBB/includes/emailer.php +++ b/phpBB/includes/emailer.php @@ -81,11 +81,11 @@ class emailer function use_template($template_file, $template_lang = '') { - global $board_config, $phpbb_root_path; + global $config, $phpbb_root_path; if ( $template_lang == '' ) { - $template_lang = $board_config['default_lang']; + $template_lang = $config['default_lang']; } $this->tpl_file = $phpbb_root_path . 'language/lang_' . $template_lang . '/email/' . $template_file . '.txt'; @@ -324,10 +324,10 @@ function server_parse($socket, $response) function smtpmail($mail_to, $subject, $message, $headers = '') { // For now I'm using an array based $smtp_vars to hold the smtp server - // info, but it should probably change to $board_config... - // then the relevant info would be $board_config['smtp_host'] and - // $board_config['smtp_port']. - global $board_config; + // info, but it should probably change to $config... + // then the relevant info would be $config['smtp_host'] and + // $config['smtp_port']. + global $config; // // Fix any bare linefeeds in the message to make it RFC821 Compliant. @@ -396,37 +396,37 @@ function smtpmail($mail_to, $subject, $message, $headers = '') // Ok we have error checked as much as we can to this point let's get on // it already. // - if( !$socket = fsockopen($board_config['smtp_host'], 25, $errno, $errstr, 20) ) + if( !$socket = fsockopen($config['smtp_host'], 25, $errno, $errstr, 20) ) { message_die(ERROR, "Could not connect to smtp host : $errno : $errstr"); } server_parse($socket, "220"); - if( !empty($board_config['smtp_username']) && !empty($board_config['smtp_password']) ) + if( !empty($config['smtp_username']) && !empty($config['smtp_password']) ) { // Send the RFC2554 specified EHLO. // This improved as provided by SirSir to accomodate // both SMTP AND ESMTP capable servers - fputs($socket, "EHLO " . $board_config['smtp_host'] . "\r\n"); + fputs($socket, "EHLO " . $config['smtp_host'] . "\r\n"); server_parse($socket, "250"); fputs($socket, "AUTH LOGIN\r\n"); server_parse($socket, "334"); - fputs($socket, base64_encode($board_config['smtp_username']) . "\r\n"); + fputs($socket, base64_encode($config['smtp_username']) . "\r\n"); server_parse($socket, "334"); - fputs($socket, base64_encode($board_config['smtp_password']) . "\r\n"); + fputs($socket, base64_encode($config['smtp_password']) . "\r\n"); server_parse($socket, "235"); } else { // Send the RFC821 specified HELO. - fputs($socket, "HELO " . $board_config['smtp_host'] . "\r\n"); + fputs($socket, "HELO " . $config['smtp_host'] . "\r\n"); server_parse($socket, "250"); } // From this point onward most server response codes should be 250 // Specify who the mail is from.... - fputs($socket, "MAIL FROM: <" . $board_config['board_email'] . ">\r\n"); + fputs($socket, "MAIL FROM: <" . $config['board_email'] . ">\r\n"); server_parse($socket, "250"); // Specify each user to send to and build to header. |