Remove unused group model code

2 files changed, 5 insertions, 20 deletions

diff --git a/admin/admin_liberty_inc.php b/admin/admin_liberty_inc.php
index 164db17..4af85cc 100755
--- a/admin/admin_liberty_inc.php
+++ b/admin/admin_liberty_inc.php
@@ -33,17 +33,10 @@ if( $gBitSystem->isPackageActive( 'quota' )) {
 	];
 }
 
-if( $gBitSystem->isPackageActive( 'protector' )) {
-	$formLibertyFeatures['protector_single_role'] = [
-		'label' => 'Protector System Single role per content item',
-		'note'  => 'Limit the protector system to asign a content item to a single role. The alternative allows content in multiple roles.',
-	];
-} elseif( $gBitSystem->isPackageActive( 'protector_group' )) {
-	$formLibertyFeatures['protector_single_group'] = [
-		'label' => 'Protector System Single group per content item',
-		'note'  => 'Limit the protector system to asign a content item to a single group. The alternative allows content in multiple groups.',
-	];
-}
+$formLibertyFeatures['protector_single_role'] = [
+	'label' => 'Protector System Single role per content item',
+	'note'  => 'Limit the protector system to asign a content item to a single role. The alternative allows content in multiple roles.',
+];
 $gBitSmarty->assign( 'formLibertyFeatures', $formLibertyFeatures );
 
 $formLibertyTextareaFeatures = [
diff --git a/admin/schema_inc.php b/admin/schema_inc.php
index 55ceb25..e2462d5 100755
--- a/admin/schema_inc.php
+++ b/admin/schema_inc.php
@@ -188,7 +188,7 @@ $tables = [
 	//	CONSTRAINT ' , CONSTRAINT `liberty_process_queue` FOREIGN KEY (`content_id`) REFERENCES `".BIT_DB_PREFIX."liberty_content`( `content_id` ) '
 
 	'liberty_content_permissions'  => "
-	group_id I4 PRIMARY,
+	role_id I4 PRIMARY,
 	perm_name C(30) PRIMARY,
 	content_id I4 PRIMARY,
 	is_revoked C(1)
@@ -220,14 +220,6 @@ $tables = [
 
 ];
 
-$tables['liberty_content_permissions'] =
-" 	role_id I4 PRIMARY,
-	perm_name C(30) PRIMARY,
-	content_id I4 PRIMARY,
-	is_revoked C(1)
-	CONSTRAINT   ' , CONSTRAINT `liberty_content_id_ref` FOREIGN KEY (`content_id`) REFERENCES `".BIT_DB_PREFIX."liberty_content` (`content_id`) '
-";
-
 global $gBitInstaller;
 
 foreach( array_keys( $tables ) AS $tableName ) {