X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=view%2Ftemplates%2Fdfrn_request.tpl;h=27cc72347ccf180779ebc28e2663b8f02cdfc072;hb=e21ed2284c2d57b6cb0b299b21db659849c02f23;hp=6c63c5331507d486c553a64c375af03e7f545697;hpb=2dd8db7de880794db10664965713f8a46581bd7a;p=friendica.git

diff --git a/view/templates/dfrn_request.tpl b/view/templates/dfrn_request.tpl
index 6c63c53315..27cc72347c 100644
--- a/view/templates/dfrn_request.tpl
+++ b/view/templates/dfrn_request.tpl
@@ -5,38 +5,42 @@
 <p id="dfrn-request-intro">
 {{$page_desc}}<br />
 <ul id="dfrn-request-networks">
-<li><a href="http://friendica.com" title="{{$friendica}}">{{$friendica}}</a></li>
-<li><a href="http://joindiaspora.com" title="{{$diaspora}}">{{$diaspora}}</a> {{$diasnote}}</li>
-<li><a href="http://ostatus.org" title="{{$public_net}}" >{{$statusnet}}</a></li>
-{{if $emailnet}}<li>{{$emailnet}}</li>{{/if}}
+<li><a href="http://friendi.ca" title="{{$friendica}}">{{$friendica}}</a></li>
+<li><a href="https://diasporafoundation.org" title="{{$diaspora}}">{{$diaspora}}</a> {{$diasnote}}</li>
+<li><a href="https://gnu.io/social/" title="{{$statusnet}}" >{{$statusnet}}</a></li>
 </ul>
-{{$invite_desc}}
+{{$invite_desc nofilter}}
 </p>
 <p>
-{{$desc}}
+{{$desc nofilter}}
 </p>
 {{/if}}
 
 {{if $request}}
-<form action="{{$request}}" method="post" />
+<form action="{{$request}}" method="post">
 {{else}}
-<form action="dfrn_request/{{$nickname}}" method="post" />
+<form action="dfrn_request/{{$nickname}}" method="post">
 {{/if}}
 
 {{if $photo}}
-<img src="{{$photo}}" alt="" id="dfrn-request-photo">
+<img src="{{$photo}}" alt="" id="dfrn-request-photo" />
 {{/if}}
 
+{{if $url}}<dl><dt>{{$url_label}}</dt><dd><a target="blank" href="{{$zrl}}">{{$url}}</a></dd></dl>{{/if}}
+{{if $location}}<dl><dt>{{$location_label}}</dt><dd>{{$location}}</dd></dl>{{/if}}
+{{if $keywords}}<dl><dt>{{$keywords_label}}</dt><dd>{{$keywords}}</dd></dl>{{/if}}
+{{if $about}}<dl><dt>{{$about_label}}</dt><dd>{{$about nofilter}}</dd></dl>{{/if}}
+
 <div id="dfrn-request-url-wrapper" >
 	<label id="dfrn-url-label" for="dfrn-url" >{{$your_address}}</label>
 	{{if $myaddr}}
 		{{$myaddr}}
-		<input type="hidden" name="dfrn_url" id="dfrn-url" size="32" value="{{$myaddr|escape:'html'}}" />
+		<input type="hidden" name="dfrn_url" id="dfrn-url" size="32" value="{{$myaddr}}" />
 	{{else}}
-	<input type="text" name="dfrn_url" id="dfrn-url" size="32" value="{{$myaddr|escape:'html'}}" />
+	<input type="text" name="dfrn_url" id="dfrn-url" size="32" value="{{$myaddr}}" />
 	{{/if}}
 	{{if $url}}
-		<input type="hidden" name="url" id="url" value="{{$url|escape:'html'}}" />
+		<input type="hidden" name="url" id="url" value="{{$url}}" />
 	{{/if}}
 	<div id="dfrn-request-url-end"></div>
 </div>
@@ -78,7 +82,9 @@
 </div>
 
 	<div id="dfrn-request-submit-wrapper">
-		<input type="submit" name="submit" id="dfrn-request-submit-button" value="{{$submit|escape:'html'}}" />
-		<input type="submit" name="cancel" id="dfrn-request-cancel-button" value="{{$cancel|escape:'html'}}" />
+		{{if $submit}}
+			<input type="submit" name="submit" id="dfrn-request-submit-button" value="{{$submit}}" />
+		{{/if}}
+		<input type="submit" name="cancel" id="dfrn-request-cancel-button" value="{{$cancel}}" />
 	</div>
 </form>