X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=view%2Ftemplates%2Fauto_request.tpl;h=3f901f6759ff64f15485bc32deee1cb04f7548a4;hb=2628da422a57f573466f08ca3eb5791bf2bc35cf;hp=56653c6550212ad565539f8ac73575200430fa60;hpb=98bba66dcb335a86385967bc08ce30f5be0f4b75;p=friendica.git

diff --git a/view/templates/auto_request.tpl b/view/templates/auto_request.tpl
index 56653c6550..3f901f6759 100644
--- a/view/templates/auto_request.tpl
+++ b/view/templates/auto_request.tpl
@@ -1,22 +1,19 @@
-
-
 <h1>{{$header}}</h1>
 
 {{if $myaddr == ""}}
 <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>
 </p>
 <p>
-{{$invite_desc}}
+{{$invite_desc nofilter}}
 </p>
 <p>
-{{$desc}}
+{{$desc nofilter}}
 </p>
 {{/if}}
 
@@ -30,16 +27,21 @@
 <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" value="{{$myaddr|escape:'html'}}" />
+                <input type="hidden" name="dfrn_url" id="dfrn-url" 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>
@@ -50,7 +52,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>