aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMario <mario@mariovavti.com>2021-04-07 17:19:29 +0200
committerMario <mario@mariovavti.com>2021-04-07 17:19:29 +0200
commit6956eadaad637561561fad83727043f56f36f1b4 (patch)
tree655e176a84cb31cb1b3c8c84231434e8d9b0a3a8
parent9542c1d63c988afe4c482023bdb3f0b547957808 (diff)
downloadvolse-hubzilla-6956eadaad637561561fad83727043f56f36f1b4.tar.gz
volse-hubzilla-6956eadaad637561561fad83727043f56f36f1b4.tar.bz2
volse-hubzilla-6956eadaad637561561fad83727043f56f36f1b4.zip
registrations: minor cleanup
-rw-r--r--Zotlabs/Module/Admin/Site.php10
-rw-r--r--Zotlabs/Module/Register.php4
-rw-r--r--view/tpl/admin_site.tpl16
-rw-r--r--view/tpl/register.tpl7
4 files changed, 16 insertions, 21 deletions
diff --git a/Zotlabs/Module/Admin/Site.php b/Zotlabs/Module/Admin/Site.php
index bf47f8c62..87226295b 100644
--- a/Zotlabs/Module/Admin/Site.php
+++ b/Zotlabs/Module/Admin/Site.php
@@ -512,11 +512,11 @@ class Site {
get_config('system','verify_email'),
t("Check to verify email addresses used in account registration (recommended)."),
"", "", 'ZAR0890C'),
- '$abandon_days' => array('abandon_days',
+ '$abandon_days' => array('abandon_days',
t('Accounts abandoned after x days'),
get_config('system','account_abandon_days'),
- t('Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit.'),
- 'appears not to be implemented (2010.01)'),
+ t('Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit.')
+ ),
// <-hilmar]
'$role' => $role,
@@ -553,13 +553,9 @@ class Site {
'$maxloadavg' => array('maxloadavg', t("Maximum Load Average"), ((intval(get_config('system','maxloadavg')) > 0)?get_config('system','maxloadavg'):50), t("Maximum system load before delivery and poll processes are deferred - default 50.")),
'$default_expire_days' => array('default_expire_days', t('Expiration period in days for imported (grid/network) content'), intval(get_config('system','default_expire_days')), t('0 for no expiration of imported content')),
'$active_expire_days' => array('active_expire_days', t('Do not expire any posts which have comments less than this many days ago'), intval(get_config('system','active_expire_days',7)), ''),
-
'$sellpage' => array('site_sellpage', t('Public servers: Optional landing (marketing) webpage for new registrants'), get_config('system','sellpage',''), sprintf( t('Create this page first. Default is %s/register'),z_root())),
'$first_page' => array('first_page', t('Page to display after creating a new channel'), get_config('system','workflow_channel_next','profiles'), t('Default: profiles')),
-
'$location' => array('site_location', t('Optional: site location'), get_config('system','site_location',''), t('Region or country')),
-
-
'$form_security_token' => get_form_security_token("admin_site"),
));
}
diff --git a/Zotlabs/Module/Register.php b/Zotlabs/Module/Register.php
index 95d9da3b7..142be728a 100644
--- a/Zotlabs/Module/Register.php
+++ b/Zotlabs/Module/Register.php
@@ -573,7 +573,7 @@ class Register extends Controller {
'$reg_is' => $registration_is,
'$registertext' => bbcode(get_config('system','register_text')),
'$other_sites' => $other_sites,
- '$msg' => $opal['rn'] . ',' . $opal['an'],
+ '$msg' => $opal['msg'],
'$invitations' => $invitations,
'$invite_code' => $invite_code,
'$haveivc' => t('I have an invite code'),
@@ -593,7 +593,7 @@ 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.') : '')
+ //'$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/admin_site.tpl b/view/tpl/admin_site.tpl
index 0fff7029a..e5717a907 100644
--- a/view/tpl/admin_site.tpl
+++ b/view/tpl/admin_site.tpl
@@ -5,11 +5,11 @@
<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
{{include file="field_input.tpl" field=$sitename}}
-
+ {{include file="field_input.tpl" field=$location}}
{{include file="field_textarea.tpl" field=$banner}}
{{include file="field_textarea.tpl" field=$siteinfo}}
{{include file="field_textarea.tpl" field=$admininfo}}
-
+ {{include file="field_select.tpl" field=$access_policy}}
{{include file="field_input.tpl" field=$reply_address}}
{{include file="field_input.tpl" field=$from_email}}
{{include file="field_input.tpl" field=$from_email_name}}
@@ -33,21 +33,19 @@
{{include file="field_input.tpl" field=$register_text}}
{{include file="field_select_grouped.tpl" field=$role}}
{{include file="field_select.tpl" field=$register_policy}}
- {{include file="field_checkbox.tpl" field=$register_wo_email}}
+ {{** include file="field_checkbox.tpl" field=$register_wo_email **}}
{{include file="register_duty.tpl" field=$register_duty}}
{{include file="field_input.tpl" field=$register_perday}}
- {{include file="field_input.tpl" field=$register_sameip}}
+ {{** include file="field_input.tpl" field=$register_sameip **}}
{{$reg_delay}}
{{$reg_expire}}
{{include file="field_checkbox.tpl" field=$reg_autochannel}}
{{include file="field_checkbox.tpl" field=$invitation_only}}
{{include file="field_checkbox.tpl" field=$invitation_also}}
{{include file="field_checkbox.tpl" field=$verify_email}}
- {{include file="field_input.tpl" field=$abandon_days}}
+
{{include file="field_input.tpl" field=$minimum_age}}
- {{include file="field_select.tpl" field=$access_policy}}
- {{include file="field_input.tpl" field=$location}}
- {{include file="field_input.tpl" field=$sellpage}}
+ {{** include file="field_input.tpl" field=$sellpage **}}
{{include file="field_input.tpl" field=$first_page}}
<div class="submit">
@@ -62,6 +60,7 @@
{{include file="field_checkbox.tpl" field=$open_pubstream}}
{{include file="field_textarea.tpl" field=$incl}}
{{include file="field_textarea.tpl" field=$excl}}
+ {{include file="field_input.tpl" field=$abandon_days}}
<div class="submit">
<input type="submit" name="page_site" class="btn btn-primary" value="{{$submit}}" /></div>
@@ -80,6 +79,7 @@
{{include file="field_input.tpl" field=$maxloadavg}}
{{include file="field_input.tpl" field=$default_expire_days}}
{{include file="field_input.tpl" field=$active_expire_days}}
+
<div class="submit">
<input type="submit" name="page_site" class="btn btn-primary" value="{{$submit}}" />
diff --git a/view/tpl/register.tpl b/view/tpl/register.tpl
index b38507f92..119c47bd8 100644
--- a/view/tpl/register.tpl
+++ b/view/tpl/register.tpl
@@ -5,9 +5,10 @@
<div class="section-content-wrapper">
<form action="register" method="post" id="register-form">
<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
- {{if $reg_is || $other_sites || $now}}
+ {{if $reg_is || $other_sites || $now || $msg}}
<div class="section-content-warning-wrapper">
<h3>{{$now}}</h3>
+ <div id="register-desc" class="descriptive-paragraph">{{$msg}}</div>
<div id="register-desc" class="descriptive-paragraph">{{$reg_is}}</div>
<div id="register-sites" class="descriptive-paragraph">{{$other_sites}}</div>
</div>
@@ -59,8 +60,6 @@
<button class="btn btn-primary" type="submit" name="submit" id="newchannel-submit-button" value="{{$submit}}" {{$atform}}>{{$submit}}</button>
<div id="register-submit-end" class="register-field-end"></div>
</form>
- <br />
- <div class="descriptive-text">{{$verify_note}} {{$msg}}</div>
</div>
</div>
{{*
@@ -76,7 +75,7 @@
{{$tao}}
- var week_days = ['Monday','Tuesday','Wednesday','Thursday','Friday','Saturday','Sunday'];
+ var week_days = ['Monday', 'Tuesday','Wednesday','Thursday','Friday','Saturday','Sunday'];
$('.register_date').each( function () {
var date = new Date($(this).data('utc'));
$(this).html(date.toLocaleString(undefined, {weekday: 'short', hour: 'numeric', minute: 'numeric'}));