aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMario <mario@mariovavti.com>2021-04-09 19:25:31 +0000
committerMario <mario@mariovavti.com>2021-04-09 19:25:31 +0000
commit766fc92a3b9af06ebeda2f017e0f9fbe31eb3179 (patch)
treed9600ee624f8dde226196f73896bae2103755e6c
parentdf6f2abfbe283a25cdfe3c8fae848abda35cedaf (diff)
downloadvolse-hubzilla-766fc92a3b9af06ebeda2f017e0f9fbe31eb3179.tar.gz
volse-hubzilla-766fc92a3b9af06ebeda2f017e0f9fbe31eb3179.tar.bz2
volse-hubzilla-766fc92a3b9af06ebeda2f017e0f9fbe31eb3179.zip
register: we use default role if auto create is configured
-rw-r--r--Zotlabs/Module/Register.php17
-rw-r--r--view/tpl/register.tpl28
2 files changed, 6 insertions, 39 deletions
diff --git a/Zotlabs/Module/Register.php b/Zotlabs/Module/Register.php
index e9d313bb5..a08cc6d0d 100644
--- a/Zotlabs/Module/Register.php
+++ b/Zotlabs/Module/Register.php
@@ -492,10 +492,6 @@ class Register extends Controller {
if ( $opal['is'])
$duty['atform'] = 'disabled';
- $privacy_role = ((x($_REQUEST,'permissions_role')) ? $_REQUEST['permissions_role'] : "");
-
- $perm_roles = \Zotlabs\Access\PermissionRoles::roles();
-
// Configurable terms of service link
$tosurl = get_config('system','tos_url');
if(! $tosurl)
@@ -520,7 +516,6 @@ class Register extends Controller {
$enable_tos = 1 - intval(get_config('system','no_termsofservice'));
$auto_create = get_config('system', 'auto_channel_create', 1);
- $default_role = get_config('system','default_permissions_role');
$email_verify = get_config('system','verify_email');
$emailval = ((x($_REQUEST,'email')) ? strip_tags(trim($_REQUEST['email'])) : "");
@@ -537,7 +532,6 @@ class Register extends Controller {
$invite_code = array('invite_code', t('Please enter your invitation code'), ((x($_REQUEST,'invite_code')) ? strip_tags(trim($_REQUEST['invite_code'])) : ""));
- //
$name = array('name', t('Your name'),
((x($_REQUEST,'name')) ? $_REQUEST['name'] : ''), t('Real names are preferred.'));
$nickhub = '@' . str_replace(array('http://','https://','/'), '', get_config('system','baseurl'));
@@ -545,17 +539,9 @@ class Register extends Controller {
((x($_REQUEST,'nickname')) ? $_REQUEST['nickname'] : ''),
sprintf( t('Your nickname will be used to create an easy to remember channel address e.g. nickname%s'),
$nickhub));
- $role = array('permissions_role' , t('Channel role and privacy'),
- ($privacy_role) ? $privacy_role : 'social',
- t('Select a channel permission role for your usage needs and privacy requirements.')
- . ' <a href="help/member/member_guide#Channel_Permission_Roles" target="_blank">'
- . t('Read more about channel permission roles')
- . '</a>',$perm_roles);
- //
$tos = array('tos', $label_tos, '', '', array(t('no'),t('yes')));
-
require_once('include/bbcode.php');
$o = replace_macros(get_markup_template('register.tpl'), array(
@@ -572,8 +558,6 @@ class Register extends Controller {
'$atform' => $duty['atform'],
'$auto_create' => $auto_create,
'$name' => $name,
- '$role' => $role,
- '$default_role' => $default_role,
'$nickname' => $nickname,
'$enable_tos' => $enable_tos,
'$tos' => $tos,
@@ -584,7 +568,6 @@ class Register extends Controller {
'$pass1' => $password,
'$pass2' => $password2,
'$submit' => t('Register'),
- //'$verify_note' => (($email_verify) ? t('This site requires verification. After completing this form, please check the notice or your email for further instructions.') : '')
));
return $o;
diff --git a/view/tpl/register.tpl b/view/tpl/register.tpl
index fe67abe89..761e48773 100644
--- a/view/tpl/register.tpl
+++ b/view/tpl/register.tpl
@@ -20,25 +20,16 @@
{{/if}}
{{if $invitations}}
- <a id="zar014" href="javascript:;" style="display: inline-block;">{{$haveivc}}</a>
- <div id="zar015" style="display: none;">
- <div class="position-relative">
- <div id="invite-spinner" class="spinner-wrapper position-absolute" style="top: 2.5rem; right: 0.5rem;"><div class="spinner s"></div></div>
- {{include file="field_input.tpl" field=[$invite_code.0,$invite_code.1,"","",""]}}
- </div>
+ <a id="zar014" href="javascript:;" style="display: inline-block;">{{$haveivc}}</a>
+ <div id="zar015" style="display: none;">
+ <div class="position-relative">
+ <div id="invite-spinner" class="spinner-wrapper position-absolute" style="top: 2.5rem; right: 0.5rem;"><div class="spinner s"></div></div>
+ {{include file="field_input.tpl" field=[$invite_code.0,$invite_code.1,"","",""]}}
</div>
- {{/if}}
-
- {{if $auto_create}}
- {{if $default_role}}
- <input type="hidden" name="permissions_role" value="{{$default_role}}" />
- {{else}}
- <div class="section-content-info-wrapper">
- {{$help_role}}
</div>
- {{include file="field_select_grouped.tpl" field=$role}}
{{/if}}
+ {{if $auto_create}}
<div class="position-relative">
<div id="name-spinner" class="spinner-wrapper position-absolute" style="top: 2.5rem; right: 0.5rem;"><div class="spinner s"></div></div>
{{include file="field_input.tpl" field=[$name.0,$name.1,"","","",$atform]}}
@@ -70,10 +61,3 @@
</form>
</div>
</div>
-{{*
- COMMENTS for this template:
- hilmar, 2020.02
-*}}
-<script>
-
-</script>