Namesspace tidies for general authentication functions

4 files changed, 6 insertions, 4 deletions

diff --git a/includes/classes/BaseAuth.php b/includes/classes/BaseAuth.php
index dfea52e..11fc29e 100755
--- a/includes/classes/BaseAuth.php
+++ b/includes/classes/BaseAuth.php
@@ -177,7 +177,7 @@ class BaseAuth {
 		} elseif (!empty($pAuthMixed)) {
 			$authPlugin=BaseAuth::getAuthMethod( $pAuthMixed );
 			if (file_exists( $authPlugin['file'] )) {
-//				require_once $authPlugin['file'];
+				require_once $authPlugin['file'];
 				$cl = $authPlugin['class'];
 				$instance = new $cl();
 				if( $instance->isSupported() ) {
diff --git a/includes/register_inc.php b/includes/register_inc.php
index 6d8c338..903e921 100755
--- a/includes/register_inc.php
+++ b/includes/register_inc.php
@@ -3,6 +3,7 @@
 use Bitweaver\HttpStatusCodes;
 use Bitweaver\KernelTools;
 use Bitweaver\Wiki\BitPage;
+use Bitweaver\Users\RolePermUser;
 
 	// Register the new user
 	$userClass = $gBitSystem->getConfig( 'user_class', 'RolePermUser' );
diff --git a/register.php b/register.php
index 4654fd3..c949b07 100755
--- a/register.php
+++ b/register.php
@@ -34,6 +34,7 @@ $gBitSmarty->assign( 'hybridProviders', $gBitHybridAuthManager->getEnabledProvid
 // Everything below here is needed for registration
 
 use Bitweaver\Users\BaseAuth;
+use Bitweaver\Users\RolePermUser;
 
 if( !empty( $_REQUEST['returnto'] ) ) {
 	$_SESSION['returnto'] = $_REQUEST['returnto'];
diff --git a/validate.php b/validate.php
index ddc5d0a..cbe7dbd 100755
--- a/validate.php
+++ b/validate.php
@@ -32,7 +32,7 @@ $redirectUrl = false;
 
 //Remember where user is logging in from and send them back later; using session variable for those of us who use WebISO services
 //do not use session loginfrom with signin.php or register.php - only "inline" login forms display in perm denied fatals, etc.
-if( isset( $_SERVER['HTTP_REFERER'] ) && strpos( $_SERVER['HTTP_REFERER'], USERS_PKG_DIR.'/login' ) === false && strpos( $_SERVER['HTTP_REFERER'], USERS_PKG_DIR.'/register' ) === false && strpos( $_SERVER['HTTP_REFERER'], USERS_PKG_DIR.'/validate' ) === false ) {
+if( isset( $_SERVER['HTTP_REFERER'] ) && strpos( $_SERVER['HTTP_REFERER'], USERS_PKG_PATH.'/login' ) === false && strpos( $_SERVER['HTTP_REFERER'], USERS_PKG_PATH.'/register' ) === false && strpos( $_SERVER['HTTP_REFERER'], USERS_PKG_PATH.'/validate' ) === false ) {
 	$from = parse_url( $_SERVER['HTTP_REFERER'] );
 	if( $_SERVER['HTTP_HOST'] == $from['host'] ) {
 		// We have a referer  from this site, but not an authentication URL
@@ -51,7 +51,7 @@ if( !empty( $_REQUEST['provider'] ) ) {
 		if( $gBitUser->isRegistered() ) {
 			$gBitHybridAuthManager->expungeUserProfile( $gBitUser->mUserId, $_REQUEST['provider'] );
 		}
-		\Bitweaver\bit_redirect( $_SESSION['loginfrom'] );
+		KernelTools::bit_redirect( $_SESSION['loginfrom'] );
 	} else {
 		try {
 			$auth = $gBitHybridAuthManager->authenticate( $_REQUEST['provider'], $gBitUser );
@@ -90,7 +90,7 @@ if( !empty( $_REQUEST['provider'] ) ) {
 					} elseif( !empty( $_REQUEST['auth_new'] ) && !$gBitUser->isRegistered() ) {
 						$pRegisterHash = $_REQUEST;
 						$pRegisterHash['novalidation'] = true;
-						foreach( array( 'displayName' => 'real_name', 'email'=>'email', 'emailVerified'=>'verified_email', 'gender'=>'customers_gender', 'firstName'=>'customers_firstname', 'lastName'=>'customers_lastname', 'phone'=>'customers_telephone' ) as $member=>$key ) {
+						foreach( [ 'displayName' => 'real_name', 'email' => 'email', 'emailVerified' => 'verified_email', 'gender' => 'customers_gender', 'firstName' => 'customers_firstname', 'lastName' => 'customers_lastname', 'phone' => 'customers_telephone' ] as $member=>$key ) {
 							if( $auth->$member ) {
 								$pRegisterHash[$key] = $auth->$member;
 							}