move classes to includes/classes

13 files changed, 15 insertions, 15 deletions

diff --git a/admin/mail_queue.php b/admin/mail_queue.php
index 8061fac..7c1efee 100644
--- a/admin/mail_queue.php
+++ b/admin/mail_queue.php
@@ -9,7 +9,7 @@ require_once( '../../kernel/includes/setup_inc.php' );
 $gBitSystem->verifyPermission( 'p_mail_admin' );
 $gBitSystem->verifyPermission( 'newsletters' );
 
-require_once( NEWSLETTERS_PKG_PATH.'BitNewsletterMailer.php' );
+require_once( NEWSLETTERS_PKG_CLASS_PATH.'BitNewsletterMailer.php' );
 global $gBitNewsletterMailer;
 $gBitNewsletterMailer = new BitNewsletterMailer();
 
diff --git a/admin/send.php b/admin/send.php
index df58f8e..93abbef 100644
--- a/admin/send.php
+++ b/admin/send.php
@@ -8,8 +8,8 @@
 
 // Initialization
 require_once( '../../kernel/includes/setup_inc.php' );
-include_once( NEWSLETTERS_PKG_PATH.'BitNewsletterMailer.php' );
-include_once( NEWSLETTERS_PKG_PATH.'BitNewsletterEdition.php' );
+include_once( NEWSLETTERS_PKG_CLASS_PATH.'BitNewsletterMailer.php' );
+include_once( NEWSLETTERS_PKG_CLASS_PATH.'BitNewsletterEdition.php' );
 
 $gBitSystem->verifyPackage( 'newsletters' );
 $gBitSystem->verifyPermission( 'p_send_newsletters' );
diff --git a/admin/tend_mail_queue.php b/admin/tend_mail_queue.php
index 1711bc0..cc845c8 100644
--- a/admin/tend_mail_queue.php
+++ b/admin/tend_mail_queue.php
@@ -18,7 +18,7 @@
 	$gBitSystem->verifyPermission( 'p_users_admin' );
 
 	if( $gBitSystem->isPackageActive( 'newsletters' ) ) {
-		require_once( NEWSLETTERS_PKG_PATH.'BitNewsletterMailer.php' );
+		require_once( NEWSLETTERS_PKG_CLASS_PATH.'BitNewsletterMailer.php' );
 		global $gBitNewsletterMailer;
 		$gBitNewsletterMailer = new BitNewsletterMailer();
 		$gBitNewsletterMailer->tendQueue();
diff --git a/includes/bit_setup_inc.php b/includes/bit_setup_inc.php
index 7bc8079..31acee0 100644
--- a/includes/bit_setup_inc.php
+++ b/includes/bit_setup_inc.php
@@ -18,7 +18,7 @@ if( $gBitSystem->isPackageActive( NEWSLETTERS_PKG_NAME ) ) {
 	);
 	$gBitSystem->registerAppMenu( $menuHash );
 	if( isset( $_GET['ct'] ) && strlen( $_GET['ct'] ) == 32 ) {
-		require_once( NEWSLETTERS_PKG_PATH.'BitNewsletterMailer.php' );
+		require_once( NEWSLETTERS_PKG_CLASS_PATH.'BitNewsletterMailer.php' );
 		BitNewsletterMailer::storeClickthrough( $_GET['ct'] );
 	}
 
@@ -40,8 +40,8 @@ if( $gBitSystem->isPackageActive( NEWSLETTERS_PKG_NAME ) ) {
 	function newsletters_user_register( &$pObject ) {
 		if( !empty( $_REQUEST['newsletter_optin'] ) ) {
 			// hidden flag to indicate at least one newsletter was displayed
-			require_once NEWSLETTERS_PKG_PATH.'BitNewsletter.php';
-			require_once NEWSLETTERS_PKG_PATH.'BitNewsletterMailer.php';
+			require_once NEWSLETTERS_PKG_CLASS_PATH.'BitNewsletter.php';
+			require_once NEWSLETTERS_PKG_CLASS_PATH.'BitNewsletterMailer.php';
 
 			if( !empty( $_REQUEST['unsub_all'] ) ) {
 				$subHash['unsubscribe_all'] = 'y';
diff --git a/BitNewsletter.php b/includes/classes/BitNewsletter.php
index b08d6d2..b08d6d2 100644
--- a/BitNewsletter.php
+++ b/includes/classes/BitNewsletter.php
diff --git a/BitNewsletterEdition.php b/includes/classes/BitNewsletterEdition.php
index 37b418b..37b418b 100644
--- a/BitNewsletterEdition.php
+++ b/includes/classes/BitNewsletterEdition.php
diff --git a/BitNewsletterMailer.php b/includes/classes/BitNewsletterMailer.php
index a080f06..18f298c 100644
--- a/BitNewsletterMailer.php
+++ b/includes/classes/BitNewsletterMailer.php
@@ -21,7 +21,7 @@
 /**
  * required setup
  */
-require_once( NEWSLETTERS_PKG_PATH.'BitNewsletter.php' );
+require_once( NEWSLETTERS_PKG_CLASS_PATH.'BitNewsletter.php' );
 require_once( UTIL_PKG_INCLUDE_PATH.'phpmailer/class.phpmailer.php' );
 
 /**
diff --git a/lookup_newsletter_edition_inc.php b/lookup_newsletter_edition_inc.php
index 5442e78..1d9c1d7 100644
--- a/lookup_newsletter_edition_inc.php
+++ b/lookup_newsletter_edition_inc.php
@@ -13,7 +13,7 @@
 /** 
  * Initialization
  */
- require_once( NEWSLETTERS_PKG_PATH.'BitNewsletterEdition.php' );
+ require_once( NEWSLETTERS_PKG_CLASS_PATH.'BitNewsletterEdition.php' );
 
 if( empty( $gContent ) || !is_object( $gContent ) || !$gContent->isValid() ) {
 	$editionId = !empty( $_REQUEST['edition_id'] ) ? $_REQUEST['edition_id'] : NULL;
diff --git a/lookup_newsletter_inc.php b/lookup_newsletter_inc.php
index bdb0909..d1de888 100644
--- a/lookup_newsletter_inc.php
+++ b/lookup_newsletter_inc.php
@@ -13,7 +13,7 @@
 /** 
  * Initialization
  */
-require_once( NEWSLETTERS_PKG_PATH.'BitNewsletter.php' );
+require_once( NEWSLETTERS_PKG_CLASS_PATH.'BitNewsletter.php' );
 
 if( empty( $gContent ) || !is_object( $gContent ) || !$gContent->isValid() ) {
 	$nlId = !empty( $_REQUEST['nl_id'] ) ? $_REQUEST['nl_id'] : NULL;
diff --git a/sub.php b/sub.php
index 0251a9e..6e04573 100644
--- a/sub.php
+++ b/sub.php
@@ -15,7 +15,7 @@
  * Initialization
  */
 require_once( '../kernel/includes/setup_inc.php' );
-include_once( NEWSLETTERS_PKG_PATH.'BitNewsletterMailer.php' );
+include_once( NEWSLETTERS_PKG_CLASS_PATH.'BitNewsletterMailer.php' );
 
 $gBitSystem->verifyPackage( 'newsletters' );
 
diff --git a/templates/center_list_newsletters.php b/templates/center_list_newsletters.php
index e273fd9..985e371 100644
--- a/templates/center_list_newsletters.php
+++ b/templates/center_list_newsletters.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once( NEWSLETTERS_PKG_PATH.'BitNewsletterMailer.php' );
+require_once( NEWSLETTERS_PKG_CLASS_PATH.'BitNewsletterMailer.php' );
 global $gBitSystem, $gBitUser;
 
 $gBitSystem->verifyPackage( 'newsletters' );
diff --git a/track.php b/track.php
index 3f86e76..2155d7b 100644
--- a/track.php
+++ b/track.php
@@ -14,7 +14,7 @@
  * Initialization
  */
 require_once( '../kernel/includes/setup_inc.php' );
-include_once( NEWSLETTERS_PKG_PATH.'BitNewsletterMailer.php' );
+include_once( NEWSLETTERS_PKG_CLASS_PATH.'BitNewsletterMailer.php' );
 
 if( isset( $_REQUEST["sub"] ) || $gBitUser->isRegistered() ) {
 	if( isset( $_REQUEST["sub"] ) && strlen( $_REQUEST["sub"] ) == 32 && ($subInfo = BitNewsletterMailer::lookupSubscription( array( 'url_code' => $_REQUEST["sub"] ) )) ) {
@@ -36,4 +36,4 @@ if( $fp = fopen( $trackImage, 'rb') ) {
 
 exit;
 
-?>
\ No newline at end of file
+?>
diff --git a/user_register_inc.php b/user_register_inc.php
index d16932d..c93f273 100644
--- a/user_register_inc.php
+++ b/user_register_inc.php
@@ -13,7 +13,7 @@
 /** 
  * Initialization
  */
-require_once NEWSLETTERS_PKG_PATH.'BitNewsletter.php';
+require_once NEWSLETTERS_PKG_CLASS_PATH.'BitNewsletter.php';
 
 $listHash = array( 'registration_optin' => TRUE );