Further trimming of role_model selection

4 files changed, 2 insertions, 15 deletions

diff --git a/admin/admin_features_inc.php b/admin/admin_features_inc.php
index 26ae098..d7bd741 100755
--- a/admin/admin_features_inc.php
+++ b/admin/admin_features_inc.php
@@ -131,8 +131,5 @@ if( !empty( $_REQUEST['change_prefs'] ) ) {
 	}
 }
 
-if ( defined( 'ROLE_MODEL' ) ) {
-	$gBitSmarty->assign( "role_model", true );
-}
 
 $gBitSystem->setHelpInfo('Features','Settings','Help with the features settings');
diff --git a/includes/classes/BitSystem.php b/includes/classes/BitSystem.php
index 034912c..5512635 100755
--- a/includes/classes/BitSystem.php
+++ b/includes/classes/BitSystem.php
@@ -528,9 +528,7 @@ class BitSystem extends BitSingleton {
 
 		$this->preDisplay( $pMid );
 		$gBitSmarty->assign( 'mid', $pMid );
-		if( defined( 'ROLE_MODEL' ) ) {
-			$gBitSmarty->assign( 'role_model', true );
-		}
+		
 
 		// Create key for CSP nonce value ... TODO ? this could be the tk ticket value
 		// tk only exists when logged in ;)
diff --git a/includes/config_defaults_inc.php b/includes/config_defaults_inc.php
index 12b58e7..626cee6 100755
--- a/includes/config_defaults_inc.php
+++ b/includes/config_defaults_inc.php
@@ -111,10 +111,6 @@ if( !defined( 'EVIL_EXTENSION_PATTERN' )) {
 	define( 'EVIL_EXTENSION_PATTERN', "#\.(htaccess|pl|php|php3|php4|phtml|py|cgi|asp|jsp|sh|shtml)$#i" );
 }
 
-// Uncomment to switch to role team model ...
-if( !defined( 'ROLE_MODEL' )) {
-	define( 'ROLE_MODEL', true );
-}
 
 if( !defined( 'ANONYMOUS_TEAM_ID' ) ) {
 	define( 'ANONYMOUS_TEAM_ID', -1 );
diff --git a/templates/admin_features.tpl b/templates/admin_features.tpl
index bf175f9..094ccd9 100755
--- a/templates/admin_features.tpl
+++ b/templates/admin_features.tpl
@@ -38,11 +38,7 @@
 						<select name="bit_index" id="bit_index">
 							<option value="my_page"{if $gBitSystem->getConfig('bit_index') eq 'my_page'} selected="selected"{/if}>{tr}My {$gBitSystem->getConfig('site_title')} Page{/tr}</option>
 							<option value="user_home"{if $gBitSystem->getConfig('bit_index') eq 'user_home'} selected="selected"{/if}>{tr}User's homepage{/tr}</option>
-							{if $smarty.const.ROLE_MODEL }
-								<option value="role_home"{if $gBitSystem->getConfig('bit_index') eq 'role_home'} selected="selected"{/if}>{tr}Role home{/tr}</option>
-							{else}
-								<option value="group_home"{if $gBitSystem->getConfig('bit_index') eq 'group_home'} selected="selected"{/if}>{tr}Group home{/tr}</option>
-							{/if}
+							<option value="role_home"{if $gBitSystem->getConfig('bit_index') eq 'role_home'} selected="selected"{/if}>{tr}Role home{/tr}</option>
 							<option value="users_custom_home"{if $gBitSystem->getConfig('bit_index') eq $gBitSystem->getConfig('site_url_index')} selected="selected"{/if}>{tr}Custom home{/tr}</option>
 							{foreach key=name item=package from=$gBitSystem->mPackages}
 								{if $package.homeable && $package.installed}