From cb7648359cf0e8191d779a2ee5b6a766e8115175 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Sun, 26 Nov 2017 02:31:26 +0000
Subject: [PATCH] When we are requesting a conneczion, the contactis no longer
 "blocked"

---
 mod/contacts.php                           | 1 +
 view/templates/contact_edit.tpl            | 3 ++-
 view/theme/frio/templates/contact_edit.tpl | 3 ++-
 view/theme/vier/templates/contact_edit.tpl | 3 ++-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/mod/contacts.php b/mod/contacts.php
index 8889e65131..35be8e79e3 100644
--- a/mod/contacts.php
+++ b/mod/contacts.php
@@ -647,6 +647,7 @@ function contacts_content(App $a) {
 			'$blocked' => (($contact['blocked']) ? t('Currently blocked') : ''),
 			'$ignored' => (($contact['readonly']) ? t('Currently ignored') : ''),
 			'$archived' => (($contact['archive']) ? t('Currently archived') : ''),
+			'$pending' => (($contact['pending']) ? t('Awaiting connection acknowledge') : ''),
 			'$hidden' => array('hidden', t('Hide this contact from others'), ($contact['hidden'] == 1), t('Replies/likes to your public posts <strong>may</strong> still be visible')),
 			'$notify' => array('notify', t('Notification for new posts'), ($contact['notify_new_posts'] == 1), t('Send a notification of every new post of this contact')),
 			'$fetch_further_information' => $fetch_further_information,
diff --git a/view/templates/contact_edit.tpl b/view/templates/contact_edit.tpl
index 4493161899..ab38a1c6c1 100644
--- a/view/templates/contact_edit.tpl
+++ b/view/templates/contact_edit.tpl
@@ -39,7 +39,8 @@
 
 						{{if $lost_contact}}<li><div id="lost-contact-message">{{$lost_contact}}</div></li>{{/if}}
 						{{if $insecure}}<li><div id="insecure-message">{{$insecure}}</div></li>	{{/if}}
-						{{if $blocked}}<li><div id="block-message">{{$blocked}}</div></li>{{/if}}
+						{{if $blocked && !$pending}}<li><div id="block-message">{{$blocked}}</div></li>{{/if}}
+						{{if $pending}}<li><div id="pending-message">{{$pending}}</div></li>{{/if}}
 						{{if $ignored}}<li><div id="ignore-message">{{$ignored}}</div></li>{{/if}}
 						{{if $archived}}<li><div id="archive-message">{{$archived}}</div></li>{{/if}}
 					</ul>
diff --git a/view/theme/frio/templates/contact_edit.tpl b/view/theme/frio/templates/contact_edit.tpl
index 52f3fc545e..8a202197b8 100644
--- a/view/theme/frio/templates/contact_edit.tpl
+++ b/view/theme/frio/templates/contact_edit.tpl
@@ -52,7 +52,8 @@
 
 						{{if $lost_contact}}<li><div id="lost-contact-message">{{$lost_contact}}</div></li>{{/if}}
 						{{if $insecure}}<li><div id="insecure-message">{{$insecure}}</div></li>	{{/if}}
-						{{if $blocked}}<li><div id="block-message">{{$blocked}}</div></li>{{/if}}
+						{{if $blocked && !$pending}}<li><div id="block-message">{{$blocked}}</div></li>{{/if}}
+						{{if $pending}}<li><div id="pending-message">{{$pending}}</div></li>{{/if}}
 						{{if $ignored}}<li><div id="ignore-message">{{$ignored}}</div></li>{{/if}}
 						{{if $archived}}<li><div id="archive-message">{{$archived}}</div></li>{{/if}}
 					</ul>
diff --git a/view/theme/vier/templates/contact_edit.tpl b/view/theme/vier/templates/contact_edit.tpl
index 9dc11a31c2..945895ba6b 100644
--- a/view/theme/vier/templates/contact_edit.tpl
+++ b/view/theme/vier/templates/contact_edit.tpl
@@ -40,7 +40,8 @@
 
 						{{if $lost_contact}}<li><div id="lost-contact-message">{{$lost_contact}}</div></li>{{/if}}
 						{{if $insecure}}<li><div id="insecure-message">{{$insecure}}</div></li>	{{/if}}
-						{{if $blocked}}<li><div id="block-message">{{$blocked}}</div></li>{{/if}}
+						{{if $blocked && !$pending}}<li><div id="block-message">{{$blocked}}</div></li>{{/if}}
+						{{if $pending}}<li><div id="pending-message">{{$pending}}</div></li>{{/if}}
 						{{if $ignored}}<li><div id="ignore-message">{{$ignored}}</div></li>{{/if}}
 						{{if $archived}}<li><div id="archive-message">{{$archived}}</div></li>{{/if}}
 					</ul>