appification of privacy groups

Zotlabs/Module/Group.php

@@ -1,11 +1,13 @@
 <?php
 namespace Zotlabs\Module;
 
+use App;
+use Zotlabs\Web\Controller;
+use Zotlabs\Lib\Apps;
+
 require_once('include/group.php');
 
-
+class Group extends Controller {
-
-class Group extends \Zotlabs\Web\Controller {
 
 	function init() {
 		if(! local_channel()) {
@@ -13,7 +15,11 @@ class Group extends \Zotlabs\Web\Controller {
 			return;
 		}
 
-		\App::$profile_uid = local_channel();
+		if(! Apps::system_app_installed(local_channel(), 'Privacy Groups')) {
+			return;
+		}
+
+		App::$profile_uid = local_channel();
 
 		nav_set_selected('Privacy Groups');
 	}
@@ -24,6 +30,10 @@ class Group extends \Zotlabs\Web\Controller {
 			notice( t('Permission denied.') . EOL);
 			return;
 		}
+
+		if(! Apps::system_app_installed(local_channel(), 'Privacy Groups')) {
+			return;
+		}
 	
 		if((argc() == 2) && (argv(1) === 'new')) {
 			check_form_security_token_redirectOnErr('/group/new', 'group_edit');
@@ -77,13 +87,22 @@ class Group extends \Zotlabs\Web\Controller {
 
 		$change = false;
 	
-		logger('mod_group: ' . \App::$cmd,LOGGER_DEBUG);
+		logger('mod_group: ' . App::$cmd,LOGGER_DEBUG);
 		
 		if(! local_channel()) {
 			notice( t('Permission denied') . EOL);
 			return;
 		}
 
+		if(! Apps::system_app_installed(local_channel(), 'Privacy Groups')) {
+			//Do not display any associated widgets at this point
+			App::$pdl = '';
+
+			$o = '<b>Privacy Groups App (Not Installed):</b><br>';
+			$o .= t('Management of privacy groups');
+			return $o;
+		}
+
 		// Switch to text mode interface if we have more than 'n' contacts or group members
 		$switchtotext = get_pconfig(local_channel(),'system','groupedit_image_limit');
 		if($switchtotext === false)

Zotlabs/Widget/Activity_filter.php

@@ -2,6 +2,8 @@
 
 namespace Zotlabs\Widget;
 
+use Zotlabs\Lib\Apps;
+
 class Activity_filter {
 
 	function widget($arr) {
@@ -44,7 +46,7 @@ class Activity_filter {
 			];
 		}
 
-		if(feature_enabled(local_channel(),'groups')) {
+		if(Apps::system_app_installed(local_channel(), 'Privacy Groups')) {
 			$groups = q("SELECT * FROM groups WHERE deleted = 0 AND uid = %d ORDER BY gname ASC",
 				intval(local_channel())
 			);

include/features.php

@@ -74,15 +74,6 @@ function get_features($filtered = true, $level = (-1)) {
 		'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),
-			],
-
 			[
 				'permcats',       
 				t('Permission Categories'),

include/group.php

@@ -274,7 +274,7 @@ function group_side($every="connections",$each="group",$edit = false, $group_id
 
 	$o = '';
 
-	if(! (local_channel() && feature_enabled(local_channel(),'groups'))) {
+	if(! (local_channel() && \Zotlabs\Lib\Apps::system_app_installed(local_channel(), 'Privacy Groups'))) {
 		return '';
 	}
 

include/nav.php

@@ -93,7 +93,7 @@ function nav($template = 'default') {
  		if(! $_SESSION['delegate']) {
 			$nav['manage'] = array('manage', t('Channel Manager'), "", t('Manage your channels'),'manage_nav_btn');
  		}
-		if(feature_enabled(local_channel(),'groups'))
+		if(Apps::system_app_installed(local_channel(), 'Privacy Groups'))
 			$nav['group'] = array('group', t('Privacy Groups'),"", t('Manage your privacy groups'),'group_nav_btn');
 
  		$nav['settings'] = array('settings', t('Settings'),"", t('Account/Channel Settings'),'settings_nav_btn');