From 9a155cf5a576e01960c8d8b6128bfc27077211af Mon Sep 17 00:00:00 2001 From: zotlabs Date: Fri, 23 Mar 2018 19:03:30 -0700 Subject: turn newmember widget into a feature --- Zotlabs/Widget/Newmember.php | 12 +----------- include/features.php | 10 +++++++++- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/Zotlabs/Widget/Newmember.php b/Zotlabs/Widget/Newmember.php index afa808e6f..1a4b575b9 100644 --- a/Zotlabs/Widget/Newmember.php +++ b/Zotlabs/Widget/Newmember.php @@ -9,9 +9,6 @@ class Newmember { if(! local_channel()) return EMPTY_STR; - if(get_pconfig(local_channel(), 'system', 'disable_newmemberwidget')) - return EMPTY_STR; - $c = \App::get_channel(); if(! $c) return EMPTY_STR; @@ -20,16 +17,9 @@ class Newmember { if(! $a) return EMPTY_STR; - 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')) + if(! feature_enabled(local_channel(),'start_menu')) return EMPTY_STR; - $options = [ t('Profile Creation'), [ diff --git a/include/features.php b/include/features.php index 993266977..3928fc5cf 100644 --- a/include/features.php +++ b/include/features.php @@ -45,6 +45,7 @@ function feature_level($feature,$def) { function get_features($filtered = true) { + $account = \App::get_account(); $arr = [ @@ -53,7 +54,14 @@ function get_features($filtered = true) { t('General Features'), - + [ + 'start_menu', + t('New Member Links'), + t('Display new member quick links menu'), + true, + get_config('feature_lock','start_menu'), + feature_level('start_menu',1), + ], [ 'advanced_profiles', -- cgit v1.2.3 From 4ef2493e957ce1f2c8ea4045dba2746032f34d41 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Sun, 25 Mar 2018 21:15:23 -0700 Subject: testing start_menu feature --- include/features.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/include/features.php b/include/features.php index 3928fc5cf..5481c37a4 100644 --- a/include/features.php +++ b/include/features.php @@ -28,8 +28,9 @@ function get_feature_default($feature) { $f = get_features(false); foreach($f as $cat) { foreach($cat as $feat) { - if(is_array($feat) && $feat[0] === $feature) + if(is_array($feat) && $feat[0] === $feature) { return $feat[3]; + } } } return false; @@ -58,7 +59,7 @@ function get_features($filtered = true) { 'start_menu', t('New Member Links'), t('Display new member quick links menu'), - true, + (($account['account_created'] > datetime_convert('','','now - 60 days')) ? true : false), get_config('feature_lock','start_menu'), feature_level('start_menu',1), ], -- cgit v1.2.3