Remove ROLE_MODEL code

3 files changed, 16 insertions, 51 deletions

diff --git a/admin/admin_login_inc.php b/admin/admin_login_inc.php
index 9651616..f472298 100644
--- a/admin/admin_login_inc.php
+++ b/admin/admin_login_inc.php
@@ -209,14 +209,8 @@ $httpSettings = array(
 );
 $gBitSmarty->assign( 'httpSettings', $httpSettings );
 
-
-if (defined ('ROLE_MODEL') ) {
-	$listHash = array( 'sort_mode' => 'role_name_asc' );
-	$gBitSmarty->assign( 'roleList', $gBitUser->getAllRoles( $listHash ));
-} else {
-	$listHash = array( 'sort_mode' => 'group_name_asc' );
-	$gBitSmarty->assign('groups', $gBitUser->getAllGroups( $listHash ));
-}
+$listHash = array( 'sort_mode' => 'group_name_asc' );
+$gBitSmarty->assign('groups', $gBitUser->getAllGroups( $listHash ));
 
 if( !function_exists("gd_info" ) ) {
 	$gBitSmarty->assign( 'warning', 'PHP GD library is required for this feature (not found on your system)' );
diff --git a/admin/index.php b/admin/index.php
index 092aca4..729d728 100644
--- a/admin/index.php
+++ b/admin/index.php
@@ -12,11 +12,7 @@ $feedback = array();
 
 if( isset($_REQUEST["newuser"] ) ) {
 	$userRecord = $_REQUEST;
-	if ( defined( 'ROLE_MODEL' ) ) {
-		$newUser = new RolePermUser();
-	} else {
-		$newUser = new BitPermUser();
-	}
+	$newUser = new BitPermUser();
 	if( $newUser->importUser( $userRecord ) ) {
 		$gBitSmarty->assign( 'addSuccess', "User Added Successfully" );
 		if( empty( $_REQUEST['admin_noemail_user'] ) ) {
@@ -194,18 +190,10 @@ if( isset( $_REQUEST["action"] ) ) {
 	}
 }
 
-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 );
-	}
+// get default group and pass it to tpl
+foreach( $gBitUser->getDefaultGroup() as $defaultGroupId => $defaultGroupName ) {
+	$gBitSmarty->assign('defaultGroupId', $defaultGroupId );
+	$gBitSmarty->assign('defaultGroupName', $defaultGroupName );
 }
 
 // override default max_records
@@ -222,20 +210,11 @@ if (isset($listHash["numrows"])) {
 $listHash['listInfo']["URL"] = USERS_PKG_URL."admin/index.php";
 $gBitSmarty->assignByRef('listInfo', $listHash['listInfo']);
 
-if ( defined( 'ROLE_MODEL' ) ) {
-	// invoke edit service for the add user feature
-	$userObj = new RolePermUser();
-	$userObj->invokeServices( 'content_edit_function' );
-	// Get roles (list of roles)
-	$rolelist = $gBitUser->getRoles('', '', 'role_name_asc');
-	$gBitSmarty->assign( 'rolelist', $rolelist );
-} else {
-	// invoke edit service for the add user feature
-	$userObj = new BitPermUser();
-	$userObj->invokeServices( 'content_edit_function' );	// Get groups (list of groups)
-	$grouplist = $gBitUser->getGroups('', '', 'group_name_asc');
-	$gBitSmarty->assign( 'grouplist', $grouplist );
-}
+// invoke edit service for the add user feature
+$userObj = new BitPermUser();
+$userObj->invokeServices( 'content_edit_function' );	// Get groups (list of groups)
+$grouplist = $gBitUser->getGroups('', '', 'group_name_asc');
+$gBitSmarty->assign( 'grouplist', $grouplist );
 $gBitSmarty->assign( 'feedback', $feedback );
 
 $gBitSmarty->assign( (!empty( $_REQUEST['tab'] ) ? $_REQUEST['tab'] : 'userlist').'TabSelect', 'tdefault' );
diff --git a/admin/users_import.php b/admin/users_import.php
index db400cb..f46e6e5 100644
--- a/admin/users_import.php
+++ b/admin/users_import.php
@@ -93,18 +93,10 @@ 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 );
-	}
+// get default group and pass it to tpl
+foreach( $gBitUser->getDefaultGroup() as $defaultGroupId => $defaultGroupName ) {
+	$gBitSmarty->assign('defaultGroupId', $defaultGroupId );
+	$gBitSmarty->assign('defaultGroupName', $defaultGroupName );
 }
 
 // Display the template