From f34e6d897766ab93a0c0dede9d89f5536c4f60e9 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 27 Feb 2018 19:15:12 -0800
Subject: move oauth_client management and guest access tokens to features
 rather than auto-enabling at various feature levels. This involves string
 changes and should *not* go into 3.2RC.

---
 include/features.php | 59 ++++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 43 insertions(+), 16 deletions(-)

(limited to 'include')

diff --git a/include/features.php b/include/features.php
index 839faff67..be4017776 100644
--- a/include/features.php
+++ b/include/features.php
@@ -54,14 +54,6 @@ function get_features($filtered = true) {
 			t('General Features'),
 
 
-			[
-				'multi_profiles',      
-				t('Multiple Profiles'),      
-				t('Ability to create multiple profiles'), 
-				false, 
-				get_config('feature_lock','multi_profiles'),
-				feature_level('multi_profiles',3),
-			],
 
 			[
 				'advanced_profiles',   
@@ -163,14 +155,6 @@ function get_features($filtered = true) {
 				feature_level('ajaxchat',1),
 			],
 
-			[
-				'permcats',       
-				t('Permission Groups'),          
-				t('Provide alternate connection permission roles.'),
-				false,
-				get_config('feature_lock','permcats'),
-				feature_level('permcats',2),
-			],
 
 			[
 				'smart_birthdays',       
@@ -219,6 +203,49 @@ function get_features($filtered = true) {
 			],
 		],
 
+
+		'access_control' => [
+			t('Access Control and Permissions'),
+
+			[
+				'multi_profiles',      
+				t('Multiple Profiles'),      
+				t('Ability to create multiple profiles'), 
+				false, 
+				get_config('feature_lock','multi_profiles'),
+				feature_level('multi_profiles',3),
+			],
+
+
+			[
+				'permcats',       
+				t('Permission Groups'),          
+				t('Provide alternate connection permission roles.'),
+				false,
+				get_config('feature_lock','permcats'),
+				feature_level('permcats',2),
+			],
+
+			[
+				'oauth_clients',       
+				t('OAuth Clients'),          
+				t('Manage authenticatication tokens for mobile and remote apps.'),
+				false,
+				get_config('feature_lock','oauth_clients'),
+				feature_level('oauth_clients',1),
+			],
+
+			[
+				'access_tokens',       
+				t('Access Tokens'),          
+				t('Create access tokens so that non-members can access private content.'),
+				false,
+				get_config('feature_lock','access_tokens'),
+				feature_level('access_tokens',2),
+			],
+
+		],
+
 		// Post composition
 		'composition' => [
 
-- 
cgit v1.2.3


From 14183b8fb548b6525d6ce98b52ce5ec7f2580f2e Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 27 Feb 2018 19:18:53 -0800
Subject: move privacy groups to the newly created Access Control and
 Permissions tab. Not for 3.2 as it requires string changes from the prior
 checkin.

---
 include/features.php | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

(limited to 'include')

diff --git a/include/features.php b/include/features.php
index be4017776..993266977 100644
--- a/include/features.php
+++ b/include/features.php
@@ -207,6 +207,15 @@ function get_features($filtered = true) {
 		'access_control' => [
 			t('Access Control and Permissions'),
 
+			[
+				'groups',    		
+				t('Privacy Groups'),		
+				t('Enable management and selection of privacy groups'),
+				true,
+				get_config('feature_lock','groups'),
+				feature_level('groups',0),
+			],
+
 			[
 				'multi_profiles',      
 				t('Multiple Profiles'),      
@@ -339,14 +348,6 @@ function get_features($filtered = true) {
 				feature_level('archives',1),
 			],
 
-			[
-				'groups',    		
-				t('Privacy Groups'),		
-				t('Enable management and selection of privacy groups'),
-				true,
-				get_config('feature_lock','groups'),
-				feature_level('groups',0),
-			],
 
 			[
 				'savedsearch',    
-- 
cgit v1.2.3