mv BitMailer to BitNewsletterMailer to avoid conflict and confusion with the kernel class

3 files changed, 15 insertions, 15 deletions

diff --git a/admin/mail_queue.php b/admin/mail_queue.php
index 240c0f4..a6c05ef 100644
--- a/admin/mail_queue.php
+++ b/admin/mail_queue.php
@@ -9,25 +9,25 @@ require_once( '../../bit_setup_inc.php' );
 $gBitSystem->verifyPermission( 'p_mail_admin' );
 $gBitSystem->verifyPermission( 'newsletters' );
 
-require_once( NEWSLETTERS_PKG_PATH.'BitMailer.php' );
-global $gBitMailer;
-$gBitMailer = new BitMailer();
+require_once( NEWSLETTERS_PKG_PATH.'BitNewsletterMailer.php' );
+global $gBitNewsletterMailer;
+$gBitNewsletterMailer = new BitNewsletterMailer();
 
 if( !empty( $_REQUEST['batch_command'] ) && !empty( $_REQUEST['queue_id'] ) ) {
 	if( $_REQUEST['batch_command'] == 'delete' ) {
 		foreach( $_REQUEST['queue_id'] as $qId ) { 
-			$gBitMailer->expungeQueueRow( $qId  );
+			$gBitNewsletterMailer->expungeQueueRow( $qId  );
 		}
 	} elseif( $_REQUEST['batch_command'] == 'send' && !empty( $_REQUEST['queue_id'] ) ) {
 		foreach( $_REQUEST['queue_id'] as $queueId ) {
-			$gBitMailer->sendQueue( $queueId );
+			$gBitNewsletterMailer->sendQueue( $queueId );
 		}
 	}
 }
 
 if( empty( $_REQUEST['batch_command'] ) || $_REQUEST['batch_command'] != 'send' ) {
 	$listHash = array();
-	$queue = $gBitMailer->getQueue( $listHash );
+	$queue = $gBitNewsletterMailer->getQueue( $listHash );
 	$gBitSmarty->assign_by_ref( 'queue', $queue );
 
 	$gBitSystem->display( 'bitpackage:newsletters/mail_queue.tpl' );
diff --git a/admin/send.php b/admin/send.php
index 66e97e7..8c1b70b 100644
--- a/admin/send.php
+++ b/admin/send.php
@@ -1,6 +1,6 @@
 <?php
 
-// $Header: /cvsroot/bitweaver/_bit_newsletters/admin/send.php,v 1.18 2007/06/17 13:53:04 squareing Exp $
+// $Header: /cvsroot/bitweaver/_bit_newsletters/admin/send.php,v 1.19 2008/06/18 16:47:20 spiderr Exp $
 
 // Copyright (c) 2002-2003, Luis Argerich, Garland Foster, Eduardo Polidor, et. al.
 // All Rights Reserved. See copyright.txt for details and a complete list of authors.
@@ -8,7 +8,7 @@
 
 // Initialization
 require_once( '../../bit_setup_inc.php' );
-include_once( NEWSLETTERS_PKG_PATH.'BitMailer.php' );
+include_once( NEWSLETTERS_PKG_PATH.'BitNewsletterMailer.php' );
 include_once( NEWSLETTERS_PKG_PATH.'BitNewsletterEdition.php' );
 
 $gBitSystem->verifyPackage( 'newsletters' );
@@ -38,9 +38,9 @@ if( $gContent->isValid() && isset( $_REQUEST['preview'] ) && isset( $_REQUEST['s
 	$gBitSmarty->assign( 'sending', TRUE );
 } elseif( $gContent->isValid() && isset( $_REQUEST["send"] ) ) {
 	if( $emails = $gContent->getRecipients( $_REQUEST['send_group'], $validated, !empty( $_REQUEST['test_mode'] ) ) ) {
-		global $gBitMailer;
-		$gBitMailer = new BitMailer();
-		$queueCount = $gBitMailer->queueRecipients( $gContent->mContentId, $gContent->mNewsletter->mContentId, $emails, !empty( $_REQUEST['test_mode'] ) );
+		global $gBitNewsletterMailer;
+		$gBitNewsletterMailer = new BitNewsletterMailer();
+		$queueCount = $gBitNewsletterMailer->queueRecipients( $gContent->mContentId, $gContent->mNewsletter->mContentId, $emails, !empty( $_REQUEST['test_mode'] ) );
 		$feedback['success'] = $queueCount.' '.tra( 'emails were queued to be sent:' ).' '.$gContent->getTitle();
 		$gContent->mEditionId = NULL;
 	} else {
diff --git a/admin/tend_mail_queue.php b/admin/tend_mail_queue.php
index ba9b79d..df84eda 100644
--- a/admin/tend_mail_queue.php
+++ b/admin/tend_mail_queue.php
@@ -15,10 +15,10 @@
 	require_once( '../../bit_setup_inc.php' );
 
 	if( $gBitSystem->isPackageActive( 'newsletters' ) ) {
-		require_once( NEWSLETTERS_PKG_PATH.'BitMailer.php' );
-		global $gBitMailer;
-		$gBitMailer = new BitMailer();
-		$gBitMailer->tendQueue();
+		require_once( NEWSLETTERS_PKG_PATH.'BitNewsletterMailer.php' );
+		global $gBitNewsletterMailer;
+		$gBitNewsletterMailer = new BitNewsletterMailer();
+		$gBitNewsletterMailer->tendQueue();
 	}
 
 ?>