Namespace fixes

8 files changed, 28 insertions, 20 deletions

diff --git a/admin/admin_newsletter_subscriptions.php b/admin/admin_newsletter_subscriptions.php
index b25682d..00498a1 100644
--- a/admin/admin_newsletter_subscriptions.php
+++ b/admin/admin_newsletter_subscriptions.php
@@ -1,4 +1,5 @@
 <?php
+use Bitweaver\KernelTools;
 
 // $Header$
 
@@ -37,8 +38,8 @@ if( $gContent->isValid() ) {
 			}
 			$gBitSystem->confirmDialog( $formHash,
 				[
-					'warning' => tra('Are you sure you want to delete these subscriptions?') . ' (' . tra('Count: ') . count( $_REQUEST["checked"] ) . ')',
-					'error' => tra('This cannot be undone!'),
+					'warning' => KernelTools::tra('Are you sure you want to delete these subscriptions?') . ' (' . KernelTools::tra('Count: ') . count( $_REQUEST["checked"] ) . ')',
+					'error' => KernelTools::tra('This cannot be undone!'),
 				],
 			);
 		} else {
@@ -58,8 +59,8 @@ if( $gContent->isValid() ) {
 			}
 			$gBitSystem->confirmDialog( $formHash,
 				[
-					'warning' => tra('Are you sure you want to unsubcsribe these subscriptions?') . ' (' . tra('Count: ') . count( $_REQUEST["checked"] ) . ')',
-					'error' => tra('This cannot be undone!'),
+					'warning' => KernelTools::tra('Are you sure you want to unsubcsribe these subscriptions?') . ' (' . KernelTools::tra('Count: ') . count( $_REQUEST["checked"] ) . ')',
+					'error' => KernelTools::tra('This cannot be undone!'),
 				],
 			);
 		} else {
@@ -79,8 +80,8 @@ if( $gContent->isValid() ) {
 			}
 			$gBitSystem->confirmDialog( $formHash,
 				[
-					'warning' => tra('Are you sure you want to resubscribe these subscriptions?') . ' (' . tra('Count: ') . count( $_REQUEST["checked"] ) . ')',
-					'error' => tra('This cannot be undone!'),
+					'warning' => KernelTools::tra('Are you sure you want to resubscribe these subscriptions?') . ' (' . KernelTools::tra('Count: ') . count( $_REQUEST["checked"] ) . ')',
+					'error' => KernelTools::tra('This cannot be undone!'),
 				],
 			);
 		} else {
diff --git a/admin/admin_newsletters.php b/admin/admin_newsletters.php
index 05812ab..23ae37d 100755
--- a/admin/admin_newsletters.php
+++ b/admin/admin_newsletters.php
@@ -1,4 +1,5 @@
 <?php
+use Bitweaver\KernelTools;
 
 // $Header$
 
@@ -21,7 +22,7 @@ if( isset( $_REQUEST["remove"] ) && $gContent->isValid() ) {
 		$formHash['nl_id'] = $gContent->mNewsletterId;
 		$gBitSystem->confirmDialog( $formHash,
 			[
-				'warning' => tra('Are you sure you want to delete this newsletter?') . ' ' . $gContent->getTitle(),
+				'warning' => KernelTools::tra('Are you sure you want to delete this newsletter?') . ' ' . $gContent->getTitle(),
 			],
 		 );
 	} else {
diff --git a/admin/send.php b/admin/send.php
index f2d13cd..0a164c8 100755
--- a/admin/send.php
+++ b/admin/send.php
@@ -1,4 +1,5 @@
 <?php
+use Bitweaver\KernelTools;
 
 // $Header$
 
@@ -41,10 +42,10 @@ if( $gContent->isValid() && isset( $_REQUEST['preview'] ) && isset( $_REQUEST['s
 		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();
+		$feedback['success'] = $queueCount.' '.KernelTools::tra( 'emails were queued to be sent:' ).' '.$gContent->getTitle();
 		$gContent->mEditionId = NULL;
 	} else {
-		$feedback['error'] = tra( 'No emails were queued.' );
+		$feedback['error'] = KernelTools::tra( 'No emails were queued.' );
 	}
 }
 
@@ -66,5 +67,5 @@ if( $gContent->isValid() ) {
 
 $gBitSmarty->assign( 'feedback', $feedback );
 // Display the template
-$gBitSystem->display( 'bitpackage:newsletters/send_newsletters.tpl' , tra( "Send Newsletter" ).': '.$gContent->getTitle() , [ 'display_mode' => 'admin' ]);
+$gBitSystem->display( 'bitpackage:newsletters/send_newsletters.tpl' , KernelTools::tra( "Send Newsletter" ).': '.$gContent->getTitle() , [ 'display_mode' => 'admin' ]);
 
diff --git a/edition.php b/edition.php
index ade0c7c..a45ae43 100755
--- a/edition.php
+++ b/edition.php
@@ -13,6 +13,7 @@
 /** 
  * Initialization
  */
+use Bitweaver\KernelTools;
 require_once( '../kernel/includes/setup_inc.php' );
 
 $gBitSystem->verifyPackage( 'newsletters' );
@@ -31,7 +32,7 @@ if (isset($_REQUEST["remove"] ) && $gContent->isValid() ) {
 		$formHash['edition_id'] = $gContent->mEditionId;
 		$gBitSystem->confirmDialog( $formHash,
 			[
-				'warning' => tra('Are you sure you want to delete this newsletter edition?'). ' ' . $gContent->getTitle(),
+				'warning' => KernelTools::tra('Are you sure you want to delete this newsletter edition?'). ' ' . $gContent->getTitle(),
 			],
 		);
 	} else {
@@ -50,7 +51,7 @@ if( $gContent->isValid() ) {
 	$editions = $gContent->getList( $listHash );
 	$gBitSmarty->assign( 'editionList', $editions );
 	$gBitSmarty->assign( 'listInfo', $listHash );
-	$title = tra("List Editions");
+	$title = KernelTools::tra("List Editions");
 	$mid = 'bitpackage:newsletters/list_editions.tpl';
 }
 
diff --git a/edition_edit.php b/edition_edit.php
index 4188036..2df74c7 100755
--- a/edition_edit.php
+++ b/edition_edit.php
@@ -14,6 +14,7 @@
 /** 
  * Initialization
  */
+use Bitweaver\KernelTools;
 require_once( '../kernel/includes/setup_inc.php' );
 $gBitSystem->verifyPackage( 'newsletters' );
 $gBitSystem->verifyPermission( 'p_newsletters_create_editions' );
@@ -94,4 +95,4 @@ $gBitSmarty->assign( 'pageInfo', $formInfo );
 $gBitSmarty->assign( 'errors', $gContent->mErrors );
 
 // Display the template
-$gBitSystem->display( 'bitpackage:newsletters/edit_edition.tpl', ($gContent->isValid() ? tra( 'Edit Edition' ).': '.$gContent->getTitle() : tra( 'Create New Edition' )) , [ 'display_mode' => 'edit' ]);
+$gBitSystem->display( 'bitpackage:newsletters/edit_edition.tpl', ($gContent->isValid() ? KernelTools::tra( 'Edit Edition' ).': '.$gContent->getTitle() : KernelTools::tra( 'Create New Edition' )) , [ 'display_mode' => 'edit' ]);
diff --git a/index.php b/index.php
index 2f482f3..f542eaa 100755
--- a/index.php
+++ b/index.php
@@ -1,4 +1,5 @@
 <?php
+use Bitweaver\KernelTools;
 // $Header$
 
 // Copyright (c) 2006 - bitweaver.org - Christian Fowler, Max Kremmel, et. al
@@ -15,4 +16,4 @@ $gBitSmarty->assign( 'gDefaultCenter', $gDefaultCenter );
 $gBitSmarty->assign( 'feedback', $feedback );
 
 // Display the template
-$gBitSystem->display( 'bitpackage:kernel/dynamic.tpl', tra( 'Newsletters' ) , [ 'display_mode' => 'display' ]);
+$gBitSystem->display( 'bitpackage:kernel/dynamic.tpl', KernelTools::tra( 'Newsletters' ) , [ 'display_mode' => 'display' ]);
diff --git a/newsletters.php b/newsletters.php
index 229cc44..26d37da 100755
--- a/newsletters.php
+++ b/newsletters.php
@@ -15,6 +15,7 @@
 /** 
  * Initialization
  */
+use Bitweaver\KernelTools;
  require_once( '../kernel/includes/setup_inc.php' );
 $gBitSystem->verifyPackage( 'newsletters' );
 $gBitSystem->verifyPermission( 'p_newsletters_create' );
@@ -29,7 +30,7 @@ if( isset( $_REQUEST["remove"] ) && $gContent->isValid() ) {
 		$formHash['nl_id'] = $gContent->mNewsletterId;
 		$gBitSystem->confirmDialog( $formHash,
 			[
-				'warning' => tra('Are you sure you want to delete this newsletter?') . ' ' . $gContent->getTitle(),
+				'warning' => KernelTools::tra('Are you sure you want to delete this newsletter?') . ' ' . $gContent->getTitle(),
 			],
 		 );
 	} else {
@@ -44,7 +45,7 @@ if( isset( $_REQUEST["remove"] ) && $gContent->isValid() ) {
 	header( "Location: ".$_SERVER['SCRIPT_NAME'] );
 	die;
 } elseif( !empty( $_REQUEST['cancel'] ) ) {
-	bit_redirect( NEWSLETTERS_PKG_URL );
+	KernelTools::bit_redirect( NEWSLETTERS_PKG_URL );
 }
 
 $gContent->invokeServices( 'content_edit_function' );
diff --git a/sub.php b/sub.php
index 756abc0..f375449 100755
--- a/sub.php
+++ b/sub.php
@@ -14,13 +14,14 @@
 /** 
  * Initialization
  */
+use Bitweaver\KernelTools;
 require_once( '../kernel/includes/setup_inc.php' );
 include_once( NEWSLETTERS_PKG_CLASS_PATH.'BitNewsletterMailer.php' );
 
 $gBitSystem->verifyPackage( 'newsletters' );
 
 if( !$gBitUser->isRegistered() && !$gBitUser->hasPermission( 'p_newsletters_subscribe' ) && empty( $_REQUEST['c'] ) ) {
-	$gBitSystem->fatalError( tra("You must be logged in to subscribe to newsletters"));
+	$gBitSystem->fatalError( KernelTools::tra("You must be logged in to subscribe to newsletters"));
 }
 
 require_once( NEWSLETTERS_PKG_INCLUDE_PATH.'lookup_newsletter_inc.php' );
@@ -72,16 +73,16 @@ if( isset( $_REQUEST["update"] ) ) {
 	}
 
 	if( BitNewsletterMailer::storeSubscriptions( $subHash ) ) {
-		$feedback['success'] = tra( "Your subscriptions were updated." );
+		$feedback['success'] = KernelTools::tra( "Your subscriptions were updated." );
 	} else {
-		$feedback['error'] = tra( "Subscriptions were not updated." );
+		$feedback['error'] = KernelTools::tra( "Subscriptions were not updated." );
 	}
 	$unsubs = BitNewsletterMailer::getUnsubscriptions( $lookup );
 }
 
 if( isset( $_REQUEST["subscribe"] ) && !empty( $_REQUEST["email"] ) ) {
 	$gBitSystem->verifyPermission( 'p_newsletters_subscribe' );
-	$feedback['success'] = tra( "Thanks for your subscription. You will receive an email soon to confirm your subscription. No newsletters will be sent to you until the subscription is confirmed." );
+	$feedback['success'] = KernelTools::tra( "Thanks for your subscription. You will receive an email soon to confirm your subscription. No newsletters will be sent to you until the subscription is confirmed." );
 
 	if( !$gBitUser->hasPermission( 'p_subscribe_email' ) ) {
 		$_REQUEST["email"] = $gBitUser->mInfo['email'];