From 4285f2f8bb7114bc78701ec0eec1a50d86cd0916 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Mon, 24 Dec 2018 23:14:09 -0500
Subject: [PATCH 1/2] Remove unused template variable in dfrn_req_confirm

- Replace killme() by exit() in mod/dfrn_request
---
 mod/dfrn_request.php                | 4 +---
 view/templates/dfrn_req_confirm.tpl | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php
index 16a2da5560..0e24accc01 100644
--- a/mod/dfrn_request.php
+++ b/mod/dfrn_request.php
@@ -512,8 +512,7 @@ function dfrn_request_content(App $a)
 
 			dfrn_request_post($a);
 
-			killme();
-			return; // NOTREACHED
+			exit();
 		}
 
 		$tpl = Renderer::getMarkupTemplate("dfrn_req_confirm.tpl");
@@ -521,7 +520,6 @@ function dfrn_request_content(App $a)
 			'$dfrn_url' => $dfrn_url,
 			'$aes_allow' => (($aes_allow) ? '<input type="hidden" name="aes_allow" value="1" />' : "" ),
 			'$hidethem' => L10n::t('Hide this contact'),
-			'$hidechecked' => '',
 			'$confirm_key' => $confirm_key,
 			'$welcome' => L10n::t('Welcome home %s.', $a->user['username']),
 			'$please' => L10n::t('Please confirm your introduction/connection request to %s.', $dfrn_url),
diff --git a/view/templates/dfrn_req_confirm.tpl b/view/templates/dfrn_req_confirm.tpl
index accfd4f83f..1c89ece9b7 100644
--- a/view/templates/dfrn_req_confirm.tpl
+++ b/view/templates/dfrn_req_confirm.tpl
@@ -13,7 +13,7 @@
 {{$aes_allow}}
 
 <label id="dfrn-request-homecoming-hide-label" for="dfrn-request-homecoming-hide">{{$hidethem}}</label>
-<input type="checkbox" name="hidden-contact" value="1" {{if $hidechecked}}checked="checked" {{/if}} />
+<input type="checkbox" name="hidden-contact" value="1" />
 
 
 <div id="dfrn-request-homecoming-submit-wrapper" >

From c5a3cdcf8258f33e589e6b18004281b754e676cd Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Mon, 24 Dec 2018 23:14:30 -0500
Subject: [PATCH 2/2] Unescape aes_allow in dfrn_req_confirm.tpl

---
 view/templates/dfrn_req_confirm.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/view/templates/dfrn_req_confirm.tpl b/view/templates/dfrn_req_confirm.tpl
index 1c89ece9b7..693f8cbf92 100644
--- a/view/templates/dfrn_req_confirm.tpl
+++ b/view/templates/dfrn_req_confirm.tpl
@@ -10,7 +10,7 @@
 <input type="hidden" name="dfrn_url" value="{{$dfrn_url}}" />
 <input type="hidden" name="confirm_key" value="{{$confirm_key}}" />
 <input type="hidden" name="localconfirm" value="1" />
-{{$aes_allow}}
+{{$aes_allow nofilter}}
 
 <label id="dfrn-request-homecoming-hide-label" for="dfrn-request-homecoming-hide">{{$hidethem}}</label>
 <input type="checkbox" name="hidden-contact" value="1" />