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 = '<label for="register-openid" id="label-register-openid" >$oidlabel</label><input type="text" maxlength="60" size="32" name="openid_url" class="openid" id="register-openid" value="$openid" >';
$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 = '<input type="hidden" name="profile_publish_reg" value="1" />';
} 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 @@
<input type="hidden" name="photo" value="{{$photo}}" />
<input type="hidden" name="form_security_token" value="{{$form_security_token}}">
- {{if $registertext != ""}}<div class="error-message">{{$registertext}} </div>{{/if}}
+ {{if $registertext != ""}}<div class="error-message">{{$registertext nofilter}} </div>{{/if}}
{{if $explicit_content}} <p id="register-explicid-content">{{$explicit_content_note}}</p> {{/if}}
- <p id="register-realpeople">{{$realpeople}}</p>
-
<p id="register-fill-desc">{{$fillwith}}</p>
<p id="register-fill-ext">{{$fillext}}</p>
{{if $oidlabel}}
<div id="register-openid-wrapper" >
- <label for="register-openid" id="label-register-openid" >{{$oidlabel}}</label><input type="text" maxlength="60" size="32" name="openid_url" class="openid" id="register-openid" value="{{$openid}}" >
+ <label for="register-openid" id="label-register-openid" >{{$oidlabel}}</label><input type="text" maxlength="60" size="32" name="openid_url" class="openid" id="register-openid" value="{{$openid}}" >
</div>
<div id="register-openid-end" ></div>
{{/if}}
{{if $invitations}}
-
<p id="register-invite-desc">{{$invite_desc}}</p>
<div id="register-invite-wrapper" >
<label for="register-invite" id="label-register-invite" >{{$invite_label}}</label>
<input type="text" maxlength="60" size="32" name="invite_id" id="register-invite" value="{{$invite_id}}" >
</div>
<div id="register-name-end" ></div>
-
{{/if}}
-
<div id="register-name-wrapper" >
<label for="register-name" id="label-register-name" >{{$namelabel}}</label>
<input type="text" maxlength="60" size="32" name="username" id="register-name" value="{{$username}}" >
@@ -63,29 +58,25 @@
{{include file="field_textarea.tpl" field=$permonlybox}}
{{/if}}
- {{$publish}}
+ {{$publish nofilter}}
- {{if $showtoslink}}
+{{if $showtoslink}}
<p><a href="{{$baseurl}}/tos">{{$tostext}}</a></p>
- {{/if}}
- {{if $showprivstatement}}
+{{/if}}
+{{if $showprivstatement}}
<h4>{{$privstatement.0}}</h4>
{{for $i=1 to 3}}
- <p>{{$privstatement[$i]}}</p>
+ <p>{{$privstatement[$i] nofilter}}</p>
{{/for}}
- {{/if}}
+{{/if}}
<div id="register-submit-wrapper">
<input type="submit" name="submit" id="register-submit-button" value="{{$regbutt}}" />
</div>
<div id="register-submit-end" ></div>
-<h3>{{$importh}}</h3>
+ <h3>{{$importh}}</h3>
<div id ="import-profile">
<a href="uimport">{{$importt}}</a>
</div>
</form>
-
-{{$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 @@
-
<div class="generic-page-wrapper">
<form action="register" method="post" id="register-form">
@@ -8,11 +7,10 @@
<h3 class="heading">{{$regtitle}}</h3>
- {{if $registertext != ""}}<div class="error-message">{{$registertext}} </div>{{/if}}
+ {{if $registertext != ""}}<div class="error-message">{{$registertext nofilter}}</div>{{/if}}
{{if $explicit_content}} <p id="register-explicid-content">{{$explicit_content_note}}</p> {{/if}}
-
{{if $oidlabel}}
<div id="register-openid-wrapper" class="form-group">
<label for="register-openid" id="label-register-openid" >{{$oidlabel}}</label>
@@ -82,6 +80,4 @@
<a href="uimport">{{$importt}}</a>
</div>
</form>
-
- {{$license}}
</div>