Namespace fixes

4 files changed, 9 insertions, 5 deletions

diff --git a/import/ContactOld.php b/import/ContactOld.php
index 105af63..e3fa0a7 100755
--- a/import/ContactOld.php
+++ b/import/ContactOld.php
@@ -12,6 +12,7 @@
 /**
  * required setup
  */
+use Bitweaver\KernelTools;
 use Bitweaver\Liberty\LibertyBase;		// Contact base class
 require_once CONTACT_PKG_PATH . 'lib/phpcoord-2.3.php';
 
@@ -552,7 +553,7 @@ vd($query);
 				if(	$this->mInfo = $rs->fields ) {
 /*					if(	$this->mInfo['local_custodian_code'] == 0 ) {
 						global $gBitSystem;
-						$gBitSystem->fatalError( tra( 'You do not have permission to access this contact record' ), 'error.tpl', tra( 'Permission denied.' ) );
+						$gBitSystem->fatalError( KernelTools::tra( 'You do not have permission to access this contact record' ), 'error.tpl', KernelTools::tra( 'Permission denied.' ) );
 					}
 */
 
@@ -589,7 +590,7 @@ vd($query);
 //vd($this->mInfo);
 				} else {
 					global $gBitSystem;
-					$gBitSystem->fatalError( tra( 'Contact record does not exist' ), 'error.tpl', tra( 'Not found.' ) );
+					$gBitSystem->fatalError( KernelTools::tra( 'Contact record does not exist' ), 'error.tpl', KernelTools::tra( 'Not found.' ) );
 				}
 			}
 		}
diff --git a/import/load_wande_contacts.php b/import/load_wande_contacts.php
index 3b83b04..ab75e98 100755
--- a/import/load_wande_contacts.php
+++ b/import/load_wande_contacts.php
@@ -9,6 +9,7 @@
 // Initialization
 require_once '../../kernel/includes/setup_inc.php';
 use Bitweaver\Contact\Contact;
+use Bitweaver\KernelTools;
 
 // Is package installed and enabled
 $gBitSystem->verifyPackage( 'contact' );
@@ -35,4 +36,4 @@ if ( $handle == FALSE) {
 
 $gBitSmarty->assign( 'count', $row );
 
-$gBitSystem->display( 'bitpackage:contact/load_contacts.tpl', tra( 'Load results: ' ) );
+$gBitSystem->display( 'bitpackage:contact/load_contacts.tpl', KernelTools::tra( 'Load results: ' ) );
diff --git a/list1.php b/list1.php
index dea1aaa..77d1678 100755
--- a/list1.php
+++ b/list1.php
@@ -16,6 +16,7 @@
 require_once '../kernel/includes/setup_inc.php';
 
 use Bitweaver\Contact\Contact;
+use Bitweaver\KernelTools;
 
 $gBitSystem->verifyPackage( 'contact' );
 $gBitSystem->verifyPermission( 'p_contact_view' );
@@ -43,7 +44,7 @@ if( $gBitUser->hasPermission("p_contact_view_changes") && $_SESSION['contact']['
 $listcontacts = $gContent->getList( $listHash );
 
 if ( $listHash['listInfo']['count'] == 1 ){
-	bit_redirect( CONTACT_PKG_URL."display_contact.php?content_id=".$listcontacts[0]['content_id'] );
+	KernelTools::bit_redirect( CONTACT_PKG_URL."display_contact.php?content_id=".$listcontacts[0]['content_id'] );
 }
 
 $gBitSmarty->assign( 'listcontacts', $listcontacts );
diff --git a/list2.php b/list2.php
index 991b3ed..d4d6bd4 100755
--- a/list2.php
+++ b/list2.php
@@ -16,6 +16,7 @@
 require_once '../kernel/includes/setup_inc.php';
 
 use Bitweaver\Contact\Contact;
+use Bitweaver\KernelTools;
 
 $gBitSystem->verifyPackage( 'contact' );
 $gBitSystem->verifyPermission( 'p_contact_view' );
@@ -43,7 +44,7 @@ if( $gBitUser->hasPermission("p_contact_view_changes") && $_SESSION['contact']['
 $listcontacts = $gContent->getList( $listHash );
 
 if ( $listHash['listInfo']['count'] == 1 ){
-	bit_redirect( CONTACT_PKG_URL."display_contact.php?content_id=".$listcontacts[0]['content_id'] );
+	KernelTools::bit_redirect( CONTACT_PKG_URL."display_contact.php?content_id=".$listcontacts[0]['content_id'] );
 }
 
 $gBitSmarty->assign( 'listcontacts', $listcontacts );