start deprecation of server_role

4 files changed, 14 insertions, 35 deletions

diff --git a/include/account.php b/include/account.php
index c188ce0d7..499f7303a 100644
--- a/include/account.php
+++ b/include/account.php
@@ -424,7 +424,7 @@ function account_allow($hash) {
 
 	pop_lang();
 
-	if(get_config('system','auto_channel_create') || get_config('system','server_role') === 'basic')
+	if(get_config('system','auto_channel_create'))
 		auto_channel_create($register[0]['uid']);
 
 	if ($res) {
@@ -528,7 +528,7 @@ function account_approve($hash) {
 
 
 
-	if(get_config('system','auto_channel_create') || get_config('system','server_role') === 'basic')
+	if(get_config('system','auto_channel_create'))
 		auto_channel_create($register[0]['uid']);
 	else {
 		$_SESSION['login_return_url'] = 'new_channel';
@@ -772,12 +772,6 @@ function upgrade_bool_message($bbcode = false) {
 
 function get_account_techlevel($account_id = 0) {
 
-	$role = \Zotlabs\Lib\System::get_server_role();
-	if($role == 'basic')
-		return 0;
-	if($role == 'standard')
-		return 5;
-
 	if(! $account_id) {
 		$x = \App::get_account();
 	}
diff --git a/include/features.php b/include/features.php
index 0fc6fbc1d..f32dbe82e 100644
--- a/include/features.php
+++ b/include/features.php
@@ -45,10 +45,6 @@ function feature_level($feature,$def) {
 
 function get_features($filtered = true) {
 
-	$server_role = \Zotlabs\Lib\System::get_server_role();
-
-	if($server_role === 'basic' && $filtered)
-		return array();
 
 	$arr = [
 
@@ -424,16 +420,15 @@ function get_features($filtered = true) {
 	];
 
 
-	if($server_role === 'pro') {
-		$arr['general'][] = [
-			'premium_channel', 
-			t('Premium Channel'), 
-			t('Allows you to set restrictions and terms on those that connect with your channel'),
-			false,
-			get_config('feature_lock','premium_channel'),
-			feature_level('premium_channel',4),
-		];
-	}
+	$arr['general'][] = [
+		'premium_channel', 
+		t('Premium Channel'), 
+		t('Allows you to set restrictions and terms on those that connect with your channel'),
+		false,
+		get_config('feature_lock','premium_channel'),
+		feature_level('premium_channel',4),
+	];
+
 
 	$techlevel = get_account_techlevel();
 
diff --git a/include/nav.php b/include/nav.php
index 91bade5a7..4d6c479da 100644
--- a/include/nav.php
+++ b/include/nav.php
@@ -65,8 +65,6 @@ EOT;
 		//we could additionally use this to display important system notifications e.g. for updates
 	));
 
-	$server_role = get_config('system','server_role');
-	$basic = (($server_role === 'basic') ? true : false);
 	$techlevel = get_account_techlevel();
 
 	// nav links: array of array('href', 'text', 'extra css classes', 'title')
@@ -97,7 +95,7 @@ EOT;
 	if(local_channel()) {
 
 
-		if($chans && count($chans) > 1 && feature_enabled(local_channel(),'nav_channel_select') && (! $basic))
+		if($chans && count($chans) > 1 && feature_enabled(local_channel(),'nav_channel_select'))
 			$nav['channels'] = $chans;
 
 		$nav['logout'] = ['logout',t('Logout'), "", t('End this session'),'logout_nav_btn'];
@@ -105,7 +103,7 @@ EOT;
 		// user menu
 		$nav['usermenu'][] = ['profile/' . $channel['channel_address'], t('View Profile'), "", t('Your profile page'),'profile_nav_btn'];
 
-		if(feature_enabled(local_channel(),'multi_profiles') && (! $basic))
+		if(feature_enabled(local_channel(),'multi_profiles'))
 			$nav['usermenu'][]   = ['profiles', t('Edit Profiles'),"", t('Manage/Edit profiles'),'profiles_nav_btn'];
 		else
 			$nav['usermenu'][]   = ['profiles/' . $prof[0]['id'], t('Edit Profile'),"", t('Edit your profile'),'profiles_nav_btn'];
@@ -201,8 +199,7 @@ EOT;
 		$nav['all_events']['all']=array('events', t('View events'), "", "");
 		$nav['all_events']['mark'] = array('', t('Mark all events seen'), '','');
 
-		if(! $basic)		
-			$nav['manage'] = array('manage', t('Channel Manager'), "", t('Manage Your Channels'),'manage_nav_btn');
+		$nav['manage'] = array('manage', t('Channel Manager'), "", t('Manage Your Channels'),'manage_nav_btn');
 
 		$nav['settings'] = array('settings', t('Settings'),"", t('Account/Channel Settings'),'settings_nav_btn');
 
diff --git a/include/zot.php b/include/zot.php
index d2088f272..9458b1f1e 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -2237,9 +2237,6 @@ function check_location_move($sender_hash,$locations) {
 	if(! $locations)
 		return;
 
-	if(get_config('system','server_role') !== 'basic')
-		return;
-
 	if(count($locations) != 1)
 		return;
 
@@ -2935,8 +2932,6 @@ function import_site($arr, $pubkey) {
 
 function build_sync_packet($uid = 0, $packet = null, $groups_changed = false) {
 
-	if(get_config('system','server_role') === 'basic')
-		return;
 
 	logger('build_sync_packet');
 
@@ -3086,8 +3081,6 @@ function build_sync_packet($uid = 0, $packet = null, $groups_changed = false) {
 
 function process_channel_sync_delivery($sender, $arr, $deliveries) {
 
-	if(get_config('system','server_role') === 'basic')
-		return;
 
 	require_once('include/import.php');