Merge pull request #7905 from nupplaphil/task/numeric_two_factor

[friendica.git] / view / templates / register.tpl

diff --git a/view/templates/register.tpl b/view/templates/register.tpl
index dfc35736161dbe687a490e53e6a1050fadc58db4..7aa1a4d991f1c3f138233ef9f21818f9b1199812 100644 (file)
--- a/view/templates/register.tpl
+++ b/view/templates/register.tpl
@@ -3,73 +3,81 @@
 <form action="register" method="post" id="register-form">
 
        <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}}
 
-
-       <p id="register-realpeople">{{$realpeople}}</p>
+       {{if $explicit_content}} <p id="register-explicid-content">{{$explicit_content_note}}</p> {{/if}}
 
        <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|escape:'html'}}" >
+       <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>
+       <p id="register-invite-desc">{{$invite_desc nofilter}}</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|escape:'html'}}" >
+               <input type="text" maxlength="60" size="32" name="username" id="register-name" value="{{$username}}" >
        </div>
        <div id="register-name-end" ></div>
 
 
        <div id="register-email-wrapper" >
                <label for="register-email" id="label-register-email" >{{$addrlabel}}</label>
-               <input type="text" maxlength="60" size="32" name="email" id="register-email" value="{{$email|escape:'html'}}" >
+               <input type="text" maxlength="60" size="32" name="email" id="register-email" value="{{$email}}" >
        </div>
        <div id="register-email-end" ></div>
 
-{{if $passwords}}
+{{if $ask_password}}
        {{include file="field_password.tpl" field=$password1}}
        {{include file="field_password.tpl" field=$password2}}
 {{/if}}
 
-       <p id="register-nickname-desc" >{{$nickdesc}}</p>
+       <p id="register-nickname-desc" >{{$nickdesc nofilter}}</p>
 
        <div id="register-nickname-wrapper" >
                <label for="register-nickname" id="label-register-nickname" >{{$nicklabel}}</label>
-               <input type="text" maxlength="60" size="32" name="nickname" id="register-nickname" value="{{$nickname|escape:'html'}}" ><div id="register-sitename">@{{$sitename}}</div>
+               <input type="text" maxlength="60" size="32" name="nickname" id="register-nickname" value="{{$nickname}}" ><div id="register-sitename">@{{$sitename}}</div>
        </div>
        <div id="register-nickname-end" ></div>
 
-       {{$publish}}
+{{if $permonly}}
+    {{include file="field_textarea.tpl" field=$permonlybox}}
+       <input type="input" id="registertarpit" style="display: none;" placeholder="Don't enter anything here" />
+{{/if}}
+
+       {{$publish nofilter}}
+
+{{if $showtoslink}}
+       <p><a href="{{$baseurl}}/tos">{{$tostext}}</a></p>
+{{/if}}
+{{if $showprivstatement}}
+       <h4>{{$privstatement.0}}</h4>
+       {{for $i=1 to 3}}
+       <p>{{$privstatement[$i] nofilter}}</p>
+       {{/for}}
+{{/if}}
 
        <div id="register-submit-wrapper">
-               <input type="submit" name="submit" id="register-submit-button" value="{{$regbutt|escape:'html'}}" />
+               <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}}
-
-