X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=view%2Ftemplates%2Fregister.tpl;h=2b23934b792796c08b7e71da29c085ed0d9b1db4;hb=37c7a18d00402df8cdc4233fb3be73377220a5f4;hp=15fcf29938aa27eee580897942cae39a07aae1c8;hpb=b09f2f0a5db3af26c2d9c7ecf9bbb0d85aac1c29;p=friendica.git

diff --git a/view/templates/register.tpl b/view/templates/register.tpl
index 15fcf29938..2b23934b79 100644
--- a/view/templates/register.tpl
+++ b/view/templates/register.tpl
@@ -3,34 +3,31 @@
 <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}}" >
+    	<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}}" >
@@ -44,6 +41,11 @@
 	</div>
 	<div id="register-email-end" ></div>
 
+{{if $passwords}}
+	{{include file="field_password.tpl" field=$password1}}
+	{{include file="field_password.tpl" field=$password2}}
+{{/if}}
+
 	<p id="register-nickname-desc" >{{$nickdesc}}</p>
 
 	<div id="register-nickname-wrapper" >
@@ -52,19 +54,29 @@
 	</div>
 	<div id="register-nickname-end" ></div>
 
-	{{$publish}}
+{{if $permonly}}
+    {{include file="field_textarea.tpl" field=$permonlybox}}
+{{/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}}" />
 	</div>
 	<div id="register-submit-end" ></div>
 
-<h3>{{$importh}}</h3>
+	<h3>{{$importh}}</h3>
 	<div id ="import-profile">
-		<a href="/uimport">{{$importt}}</a>
+		<a href="uimport">{{$importt}}</a>
 	</div>
 </form>
-
-{{$license}}
-
-