2 files changed, 20 insertions, 18 deletions

diff --git a/admin/assign_role_user.php b/admin/assign_role_user.php
index 29d4927..a5e79e9 100755
--- a/admin/assign_role_user.php
+++ b/admin/assign_role_user.php
@@ -8,10 +8,11 @@
 // Initialization
 require_once( '../../kernel/includes/setup_inc.php' );
 use Bitweaver\KernelTools;
+use Bitweaver\Users\RolePermUser;
 
 $gBitSystem->verifyPermission( 'p_users_admin' );
 
-if (!$gBitUser->userExists( array( 'user_id' => $_REQUEST["assign_user"] ) ) ) {
+if (!$gBitUser->userExists( [ 'user_id' => $_REQUEST["assign_user"] ] ) ) {
 	$gBitSystem->fatalError( KernelTools::tra( "User doesnt exist" ));
 }
 
@@ -24,12 +25,15 @@ if( $assignUser->isAdmin() && !$gBitUser->isAdmin() ) {
 
 if( isset( $_REQUEST["action"] ) ) {
 	$gBitUser->verifyTicket();
-	if ($_REQUEST["action"] == 'assign') {
-		$assignUser->addUserToRole( $assignUser->mUserId, $_REQUEST["role_id"] );
-	} elseif ($_REQUEST["action"] == 'removerole') {
-		$assignUser->removeUserFromRole($_REQUEST["assign_user"], $_REQUEST["role_id"]);
+	switch ($_REQUEST["action"]) {
+		case 'assign':
+			$assignUser->addUserToRole( $assignUser->mUserId, $_REQUEST["role_id"] );
+			break;
+		case 'removerole':
+			$assignUser->removeUserFromRole( $_REQUEST["assign_user"], $_REQUEST["role_id"] );
+			break;
 	}
-	bit_redirect( 'assign_role_user.php?assign_user='.$assignUser->mUserId );
+	KernelTools::bit_redirect( "assign_role_user.php?assign_user={$assignUser->mUserId}" );
 }elseif(isset($_REQUEST['set_default'])) {
 	$gBitUser->verifyTicket();
 	$assignUser->storeUserDefaultRole( $assignUser->mUserId, $_REQUEST['default_role'] );
@@ -37,11 +41,11 @@ if( isset( $_REQUEST["action"] ) ) {
 }
 $gBitSmarty->assign( 'assignUser', $assignUser );
 
-$listHash = array( 'sort_mode' => 'role_name_asc' );
-$gBitSmarty->assign('roles', $gBitUser->getAllRoles( $listHash ));
+$listHash = [ 'sort_mode' => 'role_name_asc' ];
+$roles = $gBitUser->getAllRoles( $listHash );
+$gBitSmarty->assign('roles', $roles);
 
 $gBitSystem->setBrowserTitle( 'Edit User: '.$assignUser->mUsername );
 
 // Display the template
-$gBitSystem->display( 'bitpackage:users/admin_assign_role_user.tpl', null, array( 'display_mode' => 'admin' ));
-?>
+$gBitSystem->display( 'bitpackage:users/admin_assign_role_user.tpl', null, [ 'display_mode' => 'admin' ]);
\ No newline at end of file
diff --git a/admin/edit_role.php b/admin/edit_role.php
index 15e4fbf..f5029d2 100755
--- a/admin/edit_role.php
+++ b/admin/edit_role.php
@@ -118,7 +118,7 @@ if( !empty( $_REQUEST['role_id'] ) || (!empty( $_REQUEST["action"] ) && $_REQUES
 	$gBitSmarty->assign( 'permPackages', $permPackages );
 
 	// get role list separately from the $users stuff to avoid splitting of data due to pagination
-	$listHash = array( 'sort_mode' => 'role_name_asc' );
+	$listHash = [ 'sort_mode' => 'role_name_asc' ];
 
 /*
 	// get content and pass it on to the template
@@ -129,14 +129,14 @@ if( !empty( $_REQUEST['role_id'] ) || (!empty( $_REQUEST["action"] ) && $_REQUES
 	$gBitSmarty->assign( 'contentList', $cList );
 	$gBitSmarty->assign( 'contentSelect', $contentSelect );
 */
-	$contentTypes = array( '' => KernelTools::tra( 'All Content' ) );
+	$contentTypes = [ '' => KernelTools::tra( 'All Content' ) ];
 	foreach( $gLibertySystem->mContentTypes as $cType ) {
 		$contentTypes[$cType['content_type_guid']] = $gLibertySystem->getContentTypeName( $cType['content_type_guid'] );
 	}
 	$gBitSmarty->assign( 'contentTypes', $contentTypes );
 } else {
 	// get rolelist separately from the $users stuff to avoid splitting of data due to pagination
-	$listHash = array( 'sort_mode' => !empty( $_REQUEST['sort_mode'] ) ? $_REQUEST['sort_mode'] : 'role_name_asc' );
+	$listHash = [ 'sort_mode' => !empty( $_REQUEST['sort_mode'] ) ? $_REQUEST['sort_mode'] : 'role_name_asc' ];
 }
 $gBitSmarty->assign('roleList', $gBitUser->getAllRoles( $listHash ));
 
@@ -145,11 +145,6 @@ if( empty( $mid ) ) {
 	if( !empty( $_REQUEST['role_id'] ) ) {
 		$roleInfo = $gBitUser->getRoleInfo( $_REQUEST['role_id'] );
 
-		$defaultRoleId = $gBitSystem->getConfig( 'default_home_role' );
-		$gBitSmarty->assign( 'defaultRoleId', $defaultRoleId );
-		$gBitSmarty->assign( 'roleInfo', $roleInfo );
-		$gBitSmarty->assign( 'allPerms', $allPerms );
-
 		$gBitSystem->setBrowserTitle( KernelTools::tra( 'Admininster Role' ).': '.$roleInfo['role_name'] );
 		$mid = 'bitpackage:users/admin_role_edit.tpl';
 	} else {
@@ -159,6 +154,9 @@ if( empty( $mid ) ) {
 	}
 }
 
+$gBitSmarty->assign( 'defaultRoleId', $gBitSystem->getConfig( 'default_home_role' ) );
+$gBitSmarty->assign( 'roleInfo', $roleInfo ?? [] );
+$gBitSmarty->assign( 'allPerms', $allPerms ?? [] );
 $gBitSmarty->assign('successMsg',$successMsg);
 $gBitSmarty->assign('errorMsg',$errorMsg);