diff options
| author | zotlabs <mike@macgirvin.com> | 2018-03-25 21:16:10 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2018-03-25 21:16:10 -0700 |
| commit | 5a739ddc47842700185798f4221e7afc872cf5a3 (patch) | |
| tree | 782b400703fc6ab1e460cafe320943ddf86cc459 | |
| parent | bb4f9eecbe88c5d6ead654cefefcd3c57f23c1fe (diff) | |
| parent | 4ef2493e957ce1f2c8ea4045dba2746032f34d41 (diff) | |
| download | volse-hubzilla-5a739ddc47842700185798f4221e7afc872cf5a3.tar.gz volse-hubzilla-5a739ddc47842700185798f4221e7afc872cf5a3.tar.bz2 volse-hubzilla-5a739ddc47842700185798f4221e7afc872cf5a3.zip | |
Merge branch 'newmemberwidget'
| -rw-r--r-- | Zotlabs/Widget/Newmember.php | 12 | ||||
| -rw-r--r-- | include/features.php | 13 |
2 files changed, 12 insertions, 13 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..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; @@ -45,6 +46,7 @@ function feature_level($feature,$def) { function get_features($filtered = true) { + $account = \App::get_account(); $arr = [ @@ -53,7 +55,14 @@ function get_features($filtered = true) { t('General Features'), - + [ + 'start_menu', + t('New Member Links'), + t('Display new member quick links menu'), + (($account['account_created'] > datetime_convert('','','now - 60 days')) ? true : false), + get_config('feature_lock','start_menu'), + feature_level('start_menu',1), + ], [ 'advanced_profiles', |