diff --git a/mod/register.php b/mod/register.php index b85f0ed43d..03d4cb02f6 100644 --- a/mod/register.php +++ b/mod/register.php @@ -213,20 +213,15 @@ function register_content(App $a) $noid = Config::get('system', 'no_openid'); if ($noid) { - $oidhtml = ''; $fillwith = ''; $fillext = ''; $oidlabel = ''; } else { - $oidhtml = ''; $fillwith = L10n::t("You may \x28optionally\x29 fill in this form via OpenID by supplying your OpenID and clicking 'Register'."); $fillext = L10n::t('If you are not familiar with OpenID, please leave that field blank and fill in the rest of the items.'); $oidlabel = L10n::t("Your OpenID \x28optional\x29: "); } - // I set this and got even more fake names than before... - $realpeople = ''; // L10n::t('Members of this network prefer to communicate with real people who use their real names.'); - if (Config::get('system', 'publish_all')) { $profile_publish = ''; } else { @@ -244,8 +239,6 @@ function register_content(App $a) $r = q("SELECT COUNT(*) AS `contacts` FROM `contact`"); $passwords = !$r[0]["contacts"]; - $license = ''; - $tpl = Renderer::getMarkupTemplate("register.tpl"); $arr = ['template' => $tpl]; @@ -257,14 +250,12 @@ function register_content(App $a) $tos = new Tos(); $o = Renderer::replaceMacros($tpl, [ - '$oidhtml' => $oidhtml, '$invitations' => Config::get('system', 'invitation_only'), '$permonly' => intval(Config::get('config', 'register_policy')) === REGISTER_APPROVE, '$permonlybox' => ['permonlybox', L10n::t('Note for the admin'), '', L10n::t('Leave a message for the admin, why you want to join this node')], '$invite_desc' => L10n::t('Membership on this site is by invitation only.'), '$invite_label' => L10n::t('Your invitation code: '), '$invite_id' => $invite_id, - '$realpeople' => $realpeople, '$regtitle' => L10n::t('Registration'), '$registertext' => BBCode::convert(Config::get('config', 'register_text', '')), '$fillwith' => $fillwith, @@ -284,7 +275,6 @@ function register_content(App $a) '$username' => $username, '$email' => $email, '$nickname' => $nickname, - '$license' => $license, '$sitename' => $a->getHostName(), '$importh' => L10n::t('Import'), '$importt' => L10n::t('Import your profile to this friendica instance'), diff --git a/view/templates/register.tpl b/view/templates/register.tpl index 30b2429836..2b23934b79 100644 --- a/view/templates/register.tpl +++ b/view/templates/register.tpl @@ -5,34 +5,29 @@ - {{if $registertext != ""}}
{{$registertext}}
{{/if}} + {{if $registertext != ""}}
{{$registertext nofilter}}
{{/if}} {{if $explicit_content}}

{{$explicit_content_note}}

{{/if}} -

{{$realpeople}}

-

{{$fillwith}}

{{$fillext}}

{{if $oidlabel}}
- +
{{/if}} {{if $invitations}} -

{{$invite_desc}}

- {{/if}} -
@@ -63,29 +58,25 @@ {{include file="field_textarea.tpl" field=$permonlybox}} {{/if}} - {{$publish}} + {{$publish nofilter}} - {{if $showtoslink}} +{{if $showtoslink}}

{{$tostext}}

- {{/if}} - {{if $showprivstatement}} +{{/if}} +{{if $showprivstatement}}

{{$privstatement.0}}

{{for $i=1 to 3}} -

{{$privstatement[$i]}}

+

{{$privstatement[$i] nofilter}}

{{/for}} - {{/if}} +{{/if}}
-

{{$importh}}

+

{{$importh}}

{{$importt}}
- -{{$license}} - - diff --git a/view/theme/frio/templates/register.tpl b/view/theme/frio/templates/register.tpl index 2167c418df..d46a59e873 100644 --- a/view/theme/frio/templates/register.tpl +++ b/view/theme/frio/templates/register.tpl @@ -1,4 +1,3 @@ -
@@ -8,11 +7,10 @@

{{$regtitle}}

- {{if $registertext != ""}}
{{$registertext}}
{{/if}} + {{if $registertext != ""}}
{{$registertext nofilter}}
{{/if}} {{if $explicit_content}}

{{$explicit_content_note}}

{{/if}} - {{if $oidlabel}}
@@ -82,6 +80,4 @@ {{$importt}}
- - {{$license}}