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

8 files changed, 34 insertions, 34 deletions

diff --git a/BitMailer.php b/BitNewsletterMailer.php
index de1b739..28daf88 100644
--- a/BitMailer.php
+++ b/BitNewsletterMailer.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * $Header: /cvsroot/bitweaver/_bit_newsletters/Attic/BitMailer.php,v 1.40 2008/01/02 18:26:31 spiderr Exp $
+ * $Header: /cvsroot/bitweaver/_bit_newsletters/BitNewsletterMailer.php,v 1.1 2008/06/18 16:47:20 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.40 2008/01/02 18:26:31 spiderr Exp $
+ * $Id: BitNewsletterMailer.php,v 1.1 2008/06/18 16:47:20 spiderr Exp $
  *
  * Class that handles editions of newsletters
  * @package newsletters
@@ -15,7 +15,7 @@
  *
  * @author spiderr <spider@steelsun.com>
  *
- * @version $Revision: 1.40 $ $Date: 2008/01/02 18:26:31 $ $Author: spiderr $
+ * @version $Revision: 1.1 $ $Date: 2008/06/18 16:47:20 $ $Author: spiderr $
  */
 
 /**
@@ -27,14 +27,14 @@ require_once( UTIL_PKG_PATH.'phpmailer/class.phpmailer.php' );
 /**
  * @package newsletters
  */
-class BitMailer {
+class BitNewsletterMailer {
     // Set default variables for all new objects
     var $From;
     var $FromName;
     var $Host;
     var $Mailer;                         // Alternative to IsSMTP()
     var $WordWrap;
-	function BitMailer () {
+	function BitNewsletterMailer () {
 		global $gBitDb, $gBitSystem, $gBitLanguage;
 		$this->mDb = $gBitDb;
 	}
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();
 	}
 
 ?>
diff --git a/bit_setup_inc.php b/bit_setup_inc.php
index 76d14d6..d052cb6 100644
--- a/bit_setup_inc.php
+++ b/bit_setup_inc.php
@@ -16,8 +16,8 @@ if( $gBitSystem->isPackageActive( NEWSLETTERS_PKG_NAME ) ) {
 	);
 	$gBitSystem->registerAppMenu( $menuHash );
 	if( isset( $_GET['ct'] ) && strlen( $_GET['ct'] ) == 32 ) {
-		require_once( NEWSLETTERS_PKG_PATH.'BitMailer.php' );
-		BitMailer::storeClickthrough( $_GET['ct'] );
+		require_once( NEWSLETTERS_PKG_PATH.'BitNewsletterMailer.php' );
+		BitNewsletterMailer::storeClickthrough( $_GET['ct'] );
 	}
 }
 ?>
diff --git a/sub.php b/sub.php
index 717f6da..31de7b2 100644
--- a/sub.php
+++ b/sub.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version		$Header: /cvsroot/bitweaver/_bit_newsletters/sub.php,v 1.4 2007/05/04 06:14:26 spiderr Exp $
+ * @version		$Header: /cvsroot/bitweaver/_bit_newsletters/sub.php,v 1.5 2008/06/18 16:47:20 spiderr Exp $
  * Copyright (c) 2005 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
@@ -15,7 +15,7 @@
  * Initialization
  */
 require_once( '../bit_setup_inc.php' );
-include_once( NEWSLETTERS_PKG_PATH.'BitMailer.php' );
+include_once( NEWSLETTERS_PKG_PATH.'BitNewsletterMailer.php' );
 
 $gBitSystem->verifyPackage( 'newsletters' );
 
@@ -63,19 +63,19 @@ $gBitSmarty->assign('url_subscribe', httpPrefix(). $foo["path"]);
 if( isset( $_REQUEST['c'] ) ) {
 //$gBitDb->debug();
 	$unsubs = array();
-	if( isset( $_REQUEST['c'] ) && strlen( $_REQUEST['c'] ) == 32 && ($subInfo = BitMailer::lookupSubscription( array( 'url_code' => $_REQUEST['c'] ) )) ) {
+	if( isset( $_REQUEST['c'] ) && strlen( $_REQUEST['c'] ) == 32 && ($subInfo = BitNewsletterMailer::lookupSubscription( array( 'url_code' => $_REQUEST['c'] ) )) ) {
 		if( !empty( $subInfo['user_id'] ) && BitBase::verifyId( $subInfo['user_id'] ) ) {
 			$lookup['user_id'] = $subInfo['user_id'];
 		} else {
 			$lookup['email'] = $subInfo['email'];
 		}
-		$unsubs = BitMailer::getUnsubscriptions( $lookup );
+		$unsubs = BitNewsletterMailer::getUnsubscriptions( $lookup );
 	} else {
-		if( !$subInfo = BitMailer::lookupSubscription( array( 'user_id' => $gBitUser->mUserId ) ) ) {
+		if( !$subInfo = BitNewsletterMailer::lookupSubscription( array( 'user_id' => $gBitUser->mUserId ) ) ) {
 			$subInfo = $gBitUser->mInfo;
 		}
 		$lookup['user_id'] = $gBitUser->mUserId;
-		$unsubs = BitMailer::getUnsubscriptions( $lookup );
+		$unsubs = BitNewsletterMailer::getUnsubscriptions( $lookup );
 	}
 
 	if( isset( $_REQUEST["update"] ) ) {
@@ -95,12 +95,12 @@ if( isset( $_REQUEST['c'] ) ) {
 			}
 		}
 
-		if( BitMailer::storeSubscriptions( $subHash ) ) {
+		if( BitNewsletterMailer::storeSubscriptions( $subHash ) ) {
 			$feedback['success'] = tra( "Your subscriptions were updated." );
 		} else {
 			$feedback['error'] = tra( "Subscriptions were not updated." );
 		}
-		$unsubs = BitMailer::getUnsubscriptions( $lookup );
+		$unsubs = BitNewsletterMailer::getUnsubscriptions( $lookup );
 	}
 	foreach( $unsubs as $sub ) {
 		if( !empty( $sub['unsubscribe_all'] ) ) {
diff --git a/templates/center_list_newsletters.php b/templates/center_list_newsletters.php
index 809531d..853fe6e 100644
--- a/templates/center_list_newsletters.php
+++ b/templates/center_list_newsletters.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once( NEWSLETTERS_PKG_PATH.'BitMailer.php' );
+require_once( NEWSLETTERS_PKG_PATH.'BitNewsletterMailer.php' );
 global $gBitSystem, $gBitUser;
 
 $gBitSystem->verifyPackage( 'newsletters' );
diff --git a/track.php b/track.php
index 17daef2..d39ecb3 100644
--- a/track.php
+++ b/track.php
@@ -14,11 +14,11 @@
  * Initialization
  */
 require_once( '../bit_setup_inc.php' );
-include_once( NEWSLETTERS_PKG_PATH.'BitMailer.php' );
+include_once( NEWSLETTERS_PKG_PATH.'BitNewsletterMailer.php' );
 
 if( isset( $_REQUEST["sub"] ) || $gBitUser->isRegistered() ) {
-	if( isset( $_REQUEST["sub"] ) && strlen( $_REQUEST["sub"] ) == 32 && ($subInfo = BitMailer::lookupSubscription( array( 'url_code' => $_REQUEST["sub"] ) )) ) {
-		BitMailer::trackMail( $subInfo['url_code'] );
+	if( isset( $_REQUEST["sub"] ) && strlen( $_REQUEST["sub"] ) == 32 && ($subInfo = BitNewsletterMailer::lookupSubscription( array( 'url_code' => $_REQUEST["sub"] ) )) ) {
+		BitNewsletterMailer::trackMail( $subInfo['url_code'] );
 	}
 }