X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=view%2Ftemplates%2Fregister.tpl;h=b697316de31a648337ee14bd3a50aa69a9573026;hb=4e1263c1f8aa0a3aeba0a95929678c18fc5a3c90;hp=b3a6a2c0865c618e077cd22a9a28a76f7895304e;hpb=0dc06d66a0f4bc68529fe693b919d0a72ea57a28;p=friendica.git

diff --git a/view/templates/register.tpl b/view/templates/register.tpl
index b3a6a2c086..b697316de3 100644
--- a/view/templates/register.tpl
+++ b/view/templates/register.tpl
@@ -7,55 +7,69 @@
 
 	{{if $registertext != ""}}<div class="error-message">{{$registertext nofilter}} </div>{{/if}}
 
-	{{if $explicit_content}} <p id="register-explicid-content">{{$explicit_content_note}}</p> {{/if}}
+	{{if $explicit_content}} <p id="register-explicit-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}}" >
+	<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}}">
 	</div>
-	<div id="register-openid-end" ></div>
+	<div id="register-openid-end"></div>
 {{/if}}
 
 {{if $invitations}}
 	<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 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>
+	<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}}" >
+	<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}}" required>
 	</div>
-	<div id="register-name-end" ></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}}" >
-	</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>
+
+		<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 $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}}" ><div id="register-sitename">@{{$sitename}}</div>
+	<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}}" required><div id="register-sitename">@{{$sitename}}</div>
 	</div>
-	<div id="register-nickname-end" ></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 nofilter}}
@@ -73,10 +87,12 @@
 	<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>
-	<div id ="import-profile">
-		<a href="uimport">{{$importt}}</a>
-	</div>
+	<div id="register-submit-end"></div>
+
+	{{if !$additional}}
+		<h3>{{$importh}}</h3>
+		<div id ="import-profile">
+			<a href="user/import">{{$importt}}</a>
+		</div>
+	{{/if}}
 </form>