X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=view%2Ftemplates%2Fregister.tpl;h=d79da2d33abe441414bf9cad2ce2f5f29c22a8a8;hb=ae2959c7805ae458b125f33e34f650c1520b4ccf;hp=6be4208d3193afc1bbfa32d9ce49eb6217ac2124;hpb=dd629d5fa429e5c0cd152fd7f9449fefbbad68db;p=friendica.git

diff --git a/view/templates/register.tpl b/view/templates/register.tpl
index 6be4208d31..d79da2d33a 100644
--- a/view/templates/register.tpl
+++ b/view/templates/register.tpl
@@ -5,86 +5,94 @@
 	<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}}" required>
 	</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'}}" >
-	</div>
-	<div id="register-email-end" ></div>
+	{{if !$additional}}
+		<div id="register-email-wrapper" >
+			<label for="register-email" id="label-register-email" >{{$addrlabel}}</label>
+			<input type="text" maxlength="60" size="32" name="field1" id="register-email" value="{{$email}}" required>
+		</div>
+		<div id="register-email-end" ></div>
 
-{{if $passwords}}
+		<div id="register-repeat-wrapper" >
+			<label for="register-repeat" id="label-register-repeat" >{{$addrlabel2}}</label>
+			<input type="text" maxlength="60" size="32" name="repeat" id="register-repeat" value="" required>
+		</div>
+		<div id="register-repeat-end" ></div>
+	{{/if}}
+
+{{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}}" required><div id="register-sitename">@{{$sitename}}</div>
 	</div>
 	<div id="register-nickname-end" ></div>
 
+	<input type="input" id=tarpit" name="email" style="display: none;" placeholder="Don't enter anything here"/>
+
+	{{if $additional}}
+		{{include file="field_password.tpl" field=$parent_password}}
+	{{/if}}
+
 {{if $permonly}}
-    {{include file="field_textarea.tpl" field=$permonlybox}}
+	{{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|escape:'html'}}" />
+		<input type="submit" name="submit" id="register-submit-button" value="{{$regbutt}}" />
 	</div>
 	<div id="register-submit-end" ></div>
 
-<h3>{{$importh}}</h3>
-	<div id ="import-profile">
-		<a href="uimport">{{$importt}}</a>
-	</div>
+	{{if !$additional}}
+		<h3>{{$importh}}</h3>
+		<div id ="import-profile">
+			<a href="uimport">{{$importt}}</a>
+		</div>
+	{{/if}}
 </form>
-
-{{$license}}
-
-