diff options
| author | Christian Fowler <spider@viovio.com> | 2008-01-02 18:26:31 +0000 |
|---|---|---|
| committer | Christian Fowler <spider@viovio.com> | 2008-01-02 18:26:31 +0000 |
| commit | 7a5571d627c1eefa97863f4732da41e59cf1375c (patch) | |
| tree | 624f2496c1c4c9857426b8d39badf956c2c54cec | |
| parent | 4dbdd62137462402808147c9840362341eff9092 (diff) | |
| download | newsletters-7a5571d627c1eefa97863f4732da41e59cf1375c.tar.gz newsletters-7a5571d627c1eefa97863f4732da41e59cf1375c.tar.bz2 newsletters-7a5571d627c1eefa97863f4732da41e59cf1375c.zip | |
add SMTP username and password
| -rw-r--r-- | BitMailer.php | 13 | ||||
| -rw-r--r-- | admin/admin_newsletters_inc.php | 12 |
2 files changed, 21 insertions, 4 deletions
diff --git a/BitMailer.php b/BitMailer.php index 7e5ece6..de1b739 100644 --- a/BitMailer.php +++ b/BitMailer.php @@ -1,12 +1,12 @@ <?php /** - * $Header: /cvsroot/bitweaver/_bit_newsletters/Attic/BitMailer.php,v 1.39 2008/01/02 16:43:35 spiderr Exp $ + * $Header: /cvsroot/bitweaver/_bit_newsletters/Attic/BitMailer.php,v 1.40 2008/01/02 18:26:31 spiderr Exp $ * * Copyright (c) 2004 bitweaver.org * All Rights Reserved. See copyright.txt for details and a complete list of authors. * Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details * - * $Id: BitMailer.php,v 1.39 2008/01/02 16:43:35 spiderr Exp $ + * $Id: BitMailer.php,v 1.40 2008/01/02 18:26:31 spiderr Exp $ * * Class that handles editions of newsletters * @package newsletters @@ -15,7 +15,7 @@ * * @author spiderr <spider@steelsun.com> * - * @version $Revision: 1.39 $ $Date: 2008/01/02 16:43:35 $ $Author: spiderr $ + * @version $Revision: 1.40 $ $Date: 2008/01/02 18:26:31 $ $Author: spiderr $ */ /** @@ -167,6 +167,13 @@ class BitMailer { $mailer->FromName = $gBitSystem->getConfig( 'bitmailer_from', $gBitSystem->getConfig( 'site_title' ) ); $mailer->Host = $gBitSystem->getConfig( 'bitmailer_servers', $gBitSystem->getConfig( 'kernel_server_name', '127.0.0.1' ) ); $mailer->Mailer = $gBitSystem->getConfig( 'bitmailer_protocol', 'smtp' ); // Alternative to IsSMTP() + if( $gBitSystem->getConfig( 'bitmailer_smtp_username' ) ) { + $mailer->SMTPAuth = TRUE; + $mailer->Username = $gBitSystem->getConfig( 'bitmailer_smtp_username' ); + } + if( $gBitSystem->getConfig( 'bitmailer_smtp_password' ) ) { + $mailer->Password = $gBitSystem->getConfig( 'bitmailer_smtp_password' ); + } $mailer->WordWrap = $gBitSystem->getConfig( 'bitmailer_word_wrap', 75 ); if( !$mailer->SetLanguage( $gBitLanguage->getLanguage(), UTIL_PKG_PATH.'phpmailer/language/' ) ) { $mailer->SetLanguage( 'en' ); diff --git a/admin/admin_newsletters_inc.php b/admin/admin_newsletters_inc.php index c91cac7..0f8d2d1 100644 --- a/admin/admin_newsletters_inc.php +++ b/admin/admin_newsletters_inc.php @@ -1,5 +1,5 @@ <?php -// $Header: /cvsroot/bitweaver/_bit_newsletters/admin/admin_newsletters_inc.php,v 1.6 2008/01/02 15:55:20 spiderr Exp $ +// $Header: /cvsroot/bitweaver/_bit_newsletters/admin/admin_newsletters_inc.php,v 1.7 2008/01/02 18:26:31 spiderr Exp $ $formNewsletterFeatures = array( "bitmailer_sender_email" => array( @@ -17,6 +17,16 @@ $formNewsletterFeatures = array( 'note' => '', 'default' => $gBitSystem->getConfig( 'kernel_server_name', '127.0.0.1' ), ), + "bitmailer_smtp_username" => array( + 'label' => 'SMTP Username', + 'note' => 'Only required for authenticated outbound mail servers.', + 'default' => $gBitSystem->getConfig( 'bitmailer_smtp_username' ), + ), + "bitmailer_smtp_password" => array( + 'label' => 'SMTP Password', + 'note' => 'Password for the above SMTP Username', + 'default' => $gBitSystem->getConfig( 'bitmailer_smtp_password' ), + ), "bitmailer_protocol" => array( 'label' => 'Protocol', 'note' => '', |