diff options
| author | zotlabs <mike@macgirvin.com> | 2017-05-29 13:50:02 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-05-29 13:50:02 -0700 |
| commit | 4fcfcc81172ebdfa4a27d3bca94bffe97356f600 (patch) | |
| tree | 78a53b004556fa1064e9213008e68d897a296fe2 /Zotlabs/Module/Register.php | |
| parent | b15a5f03e61eeef2086d87f497464b00ada3798e (diff) | |
| download | volse-hubzilla-4fcfcc81172ebdfa4a27d3bca94bffe97356f600.tar.gz volse-hubzilla-4fcfcc81172ebdfa4a27d3bca94bffe97356f600.tar.bz2 volse-hubzilla-4fcfcc81172ebdfa4a27d3bca94bffe97356f600.zip | |
start deprecation of server_role
Diffstat (limited to 'Zotlabs/Module/Register.php')
| -rw-r--r-- | Zotlabs/Module/Register.php | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/Zotlabs/Module/Register.php b/Zotlabs/Module/Register.php index d1986bea5..d4573156c 100644 --- a/Zotlabs/Module/Register.php +++ b/Zotlabs/Module/Register.php @@ -151,7 +151,7 @@ class Register extends \Zotlabs\Web\Controller { $new_channel = false; $next_page = 'new_channel'; - if(get_config('system','auto_channel_create') || get_config('system','server_role') == 'basic') { + if(get_config('system','auto_channel_create')) { $new_channel = auto_channel_create($result['account']['account_id']); if($new_channel['success']) { $channel_id = $new_channel['channel']['channel_id']; @@ -240,11 +240,9 @@ class Register extends \Zotlabs\Web\Controller { $role = array('permissions_role' , t('Channel role and privacy'), ($privacy_role) ? $privacy_role : 'social', t('Select a channel role with your privacy requirements.') . ' <a href="help/member/member_guide#Account_Permission_Roles" target="_blank">' . t('Read more about roles') . '</a>',$perm_roles); $tos = array('tos', $label_tos, '', '', array(t('no'),t('yes'))); - $server_role = get_config('system','server_role'); - - $auto_create = (($server_role == 'basic') || (get_config('system','auto_channel_create')) ? true : false); - $default_role = (($server_role == 'basic') ? 'social' : get_config('system','default_permissions_role')); + $auto_create = (get_config('system','auto_channel_create') ? true : false); + $default_role = get_config('system','default_permissions_role'); require_once('include/bbcode.php'); |