diff options
Diffstat (limited to 'admin/users_import.php')
| -rwxr-xr-x | admin/users_import.php | 26 |
1 files changed, 4 insertions, 22 deletions
diff --git a/admin/users_import.php b/admin/users_import.php index 0c460be..149b417 100755 --- a/admin/users_import.php +++ b/admin/users_import.php @@ -48,17 +48,8 @@ if( isset( $_REQUEST["batchimport"])) { $added = 0; $i = 1; foreach( $userRecords as $userRecord ) { - $newUser = new BitPermUser(); + $newUser = new RolePermUser(); if( $newUser->importUser( $userRecord ) ) { - if( !empty( $userRecord['groups'] ) ) { - // groups need to be separated by spaces since this is a csv file - $groups = explode( " ", $userRecord['groups'] ); - foreach( $groups as $group ) { - if( $groupId = $gBitUser->groupExists( $group, ROOT_USER_ID ) ) { - $newUser->addUserToGroup( $newUser->mUserId, $groupId ); - } - } - } if( !empty( $userRecord['roles'] ) ) { // roles need to be separated by spaces since this is a csv file $roles = explode( " ", $userRecord['roles'] ); @@ -95,18 +86,9 @@ if( isset( $_REQUEST["batchimport"])) { } } -if ( defined( 'ROLE_MODEL' ) ) { - // get default role and pass it to tpl - foreach( $gBitUser->getDefaultRole() as $defaultRoleId => $defaultRoleName ) { - $gBitSmarty->assign('defaultRoleId', $defaultRoleId ); - $gBitSmarty->assign('defaultRoleName', $defaultRoleName ); - } -} else { - // get default group and pass it to tpl - foreach( $gBitUser->getDefaultGroup() as $defaultGroupId => $defaultGroupName ) { - $gBitSmarty->assign('defaultGroupId', $defaultGroupId ); - $gBitSmarty->assign('defaultGroupName', $defaultGroupName ); - } +foreach( $gBitUser->getDefaultRole() as $defaultRoleId => $defaultRoleName ) { + $gBitSmarty->assign('defaultRoleId', $defaultRoleId ); + $gBitSmarty->assign('defaultRoleName', $defaultRoleName ); } // Display the template |