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.

---
 Zotlabs/Widget/Settings_menu.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'Zotlabs/Widget')

diff --git a/Zotlabs/Widget/Settings_menu.php b/Zotlabs/Widget/Settings_menu.php
index e15ed96a5..20241a22f 100644
--- a/Zotlabs/Widget/Settings_menu.php
+++ b/Zotlabs/Widget/Settings_menu.php
@@ -79,7 +79,7 @@ class Settings_menu {
 			'selected' => ''
 		);
 
-		if(get_account_techlevel() > 0) {
+		if(feature_enabled(local_channel(),'oauth_clients')) {
 			$tabs[] =	array(
 				'label' => t('Connected apps'),
 				'url' => z_root() . '/settings/oauth',
@@ -87,7 +87,7 @@ class Settings_menu {
 			);
 		}
 
-		if(get_account_techlevel() > 2) {
+		if(feature_enabled(local_channel(),'access_tokens')) {
 			$tabs[] =	array(
 				'label' => t('Guest Access Tokens'),
 				'url' => z_root() . '/settings/tokens',
-- 
cgit v1.2.3


From 6c60be9e8d57c26e92f704de0712def767ab8705 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 27 Feb 2018 19:51:29 -0800
Subject: rename Addon/Feature settings to addon settings [string change]

---
 Zotlabs/Widget/Settings_menu.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Zotlabs/Widget')

diff --git a/Zotlabs/Widget/Settings_menu.php b/Zotlabs/Widget/Settings_menu.php
index 20241a22f..455fdcb9b 100644
--- a/Zotlabs/Widget/Settings_menu.php
+++ b/Zotlabs/Widget/Settings_menu.php
@@ -54,7 +54,7 @@ class Settings_menu {
 		}
 
 		$tabs[] =	array(
-			'label'	=> t('Feature/Addon settings'),
+			'label'	=> t('Addon settings'),
 			'url' 	=> z_root().'/settings/featured',
 			'selected'	=> ((argv(1) === 'featured') ? 'active' : ''),
 		);
-- 
cgit v1.2.3


From 14e14c6c92dadf4c95900978135a161f5da696d9 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Wed, 28 Feb 2018 19:49:33 -0800
Subject: provide new member widget which sits beneath the notifications for
 the first 60 days after an account creation.

---
 Zotlabs/Widget/Newmember.php | 77 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 77 insertions(+)
 create mode 100644 Zotlabs/Widget/Newmember.php

(limited to 'Zotlabs/Widget')

diff --git a/Zotlabs/Widget/Newmember.php b/Zotlabs/Widget/Newmember.php
new file mode 100644
index 000000000..a3f1126cc
--- /dev/null
+++ b/Zotlabs/Widget/Newmember.php
@@ -0,0 +1,77 @@
+<?php
+
+namespace Zotlabs\Widget;
+
+class Newmember {
+
+	function widget($arr) {
+
+		if(! local_channel())
+			return EMPTY_STR;
+
+		$c = \App::get_channel();
+		if(! $c)
+			return EMPTY_STR;
+
+
+		$a = \App::get_account();
+		if(! $a)
+			return EMPTY_STR;
+
+
+		if(datetime_convert('UTC','UTC',$a['account_created']) < datetime_convert('UTC','UTC', 'now - 60 days'))
+			return EMPTY_STR;
+
+
+		$options = [
+			t('Profile Creation'),
+			[ 
+				'profile_photo' => t('Upload profile photo'),
+				'cover_photo'   => t('Upload cover photo'),
+				'profiles'      => t('Edit your profile'),
+			],
+
+			t('Find and Connect with others'),
+			[
+				'directory'     => t('View the channel directory'),
+				'suggest'       => t('View friend suggestions'),
+				'connections'   => t('Manage your connections'),
+			],
+
+			t('Communicate'),
+			[
+				'channel/' . $channel['channel_address']       => t('View your channel homepage'),
+				'network'       => t('View your network stream'),
+			],
+
+			t('Miscellaneous'),
+			[
+				'settings'      => t('Settings'),
+				'help'    	    => t('Documentation'),
+			]
+		];
+
+		$site_firehose = ((intval(get_config('system','site_firehose',0))) ? true : false);
+		$net_firehose  = ((get_config('system','disable_discover_tab',1)) ? false : true);
+
+
+		// hack to put this in the correct spot of the array
+
+		if($site_firehose || $net_firehose) {
+			$options[5]['pubstream'] = t('View public stream. Warning: not moderated');
+		}
+
+		$o = replace_macros(get_markup_template('new_member.tpl'), [
+			'$title' => t('New Member Links'),
+			'$options' => $options
+
+		]);
+
+		return $o;
+
+	}
+
+}
+
+
+	
-- 
cgit v1.2.3


From 9672d35d8c614f174b313ef1b631dc189e5ce997 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Wed, 28 Feb 2018 20:02:08 -0800
Subject: hide newmember widget if a new account was used to create a clone of
 an old channel

---
 Zotlabs/Widget/Newmember.php | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'Zotlabs/Widget')

diff --git a/Zotlabs/Widget/Newmember.php b/Zotlabs/Widget/Newmember.php
index a3f1126cc..898942ccc 100644
--- a/Zotlabs/Widget/Newmember.php
+++ b/Zotlabs/Widget/Newmember.php
@@ -22,6 +22,12 @@ class Newmember {
 		if(datetime_convert('UTC','UTC',$a['account_created']) < datetime_convert('UTC','UTC', 'now - 60 days'))
 			return EMPTY_STR;
 
+		// This could be a new account that was used to clone a very old channel
+
+		$ob = \App::get_observer();
+		if($ob && array_key_exists('xchan_name_date',$ob) && $ob['xchan_name_date'] < datetime_convert('UTC','UTC','now - 60 days'))
+			return EMPTY_STR;
+
 
 		$options = [
 			t('Profile Creation'),
-- 
cgit v1.2.3