diff options
| author | Mario Vavti <mario@mariovavti.com> | 2018-05-13 08:07:13 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2018-05-13 08:07:13 +0200 |
| commit | 4135a1021163d8f7c1fe9226a81a603f24f4b65f (patch) | |
| tree | ba5f3f1a3f45ab166ee07cd9d7f3c7cf127c159c | |
| parent | efb0ac599613129ff514d3a5a7c3b90ff2522654 (diff) | |
| parent | 7991db14be2078aacc4f731214c36e3fa3c6c507 (diff) | |
| download | volse-hubzilla-4135a1021163d8f7c1fe9226a81a603f24f4b65f.tar.gz volse-hubzilla-4135a1021163d8f7c1fe9226a81a603f24f4b65f.tar.bz2 volse-hubzilla-4135a1021163d8f7c1fe9226a81a603f24f4b65f.zip | |
Merge remote-tracking branch 'mike/master' into dev
| -rw-r--r-- | Zotlabs/Module/Register.php | 12 | ||||
| -rwxr-xr-x | view/tpl/register.tpl | 3 |
2 files changed, 10 insertions, 5 deletions
diff --git a/Zotlabs/Module/Register.php b/Zotlabs/Module/Register.php index 6bdffd034..4ab1ccd81 100644 --- a/Zotlabs/Module/Register.php +++ b/Zotlabs/Module/Register.php @@ -201,6 +201,15 @@ class Register extends \Zotlabs\Web\Controller { $registration_is = t('Registration on this hub is by approval only.'); $other_sites = t('<a href="pubsites">Register at another affiliated hub.</a>'); } + + + $invitations = false; + + if(intval(get_config('system','invitation_only'))) { + $invitations = true; + $registration_is = t('Registration on this hub is by invitation only.'); + $other_sites = t('<a href="pubsites">Register at another affiliated hub.</a>'); + } $max_dailies = intval(get_config('system','max_daily_registrations')); if($max_dailies) { @@ -270,8 +279,7 @@ class Register extends \Zotlabs\Web\Controller { '$reg_is' => $registration_is, '$registertext' => bbcode(get_config('system','register_text')), '$other_sites' => $other_sites, - '$invitations' => get_config('system','invitation_only'), - '$invite_desc' => t('Membership on this site is by invitation only.'), + '$invitations' => $invitations, '$invite_code' => $invite_code, '$auto_create' => $auto_create, '$name' => $name, diff --git a/view/tpl/register.tpl b/view/tpl/register.tpl index 335d5f979..33ca46ba1 100755 --- a/view/tpl/register.tpl +++ b/view/tpl/register.tpl @@ -18,9 +18,6 @@ {{/if}} {{if $invitations}} - <div class="section-content-info-wrapper"> - <div id="register-invite-desc" class="descriptive-paragraph">{{$invite_desc}}</div> - </div> {{include file="field_input.tpl" field=$invite_code}} {{/if}} |