From: Friendika <info@friendika.com>
Date: Tue, 16 Aug 2011 02:31:45 +0000 (-0700)
Subject: diaspora confirm cleanup
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=8e3506048a3c8bc6fd8fb86fdbf813ff9fb3adc9;p=friendica.git

diaspora confirm cleanup
---

diff --git a/mod/contacts.php b/mod/contacts.php
index f64709ab6c..f130b74c04 100644
--- a/mod/contacts.php
+++ b/mod/contacts.php
@@ -319,7 +319,7 @@ function contacts_content(&$a) {
 			'$contact_id' => $r[0]['id'],
 			'$block_text' => (($r[0]['blocked']) ? t('Unblock this contact') : t('Block this contact') ),
 			'$ignore_text' => (($r[0]['readonly']) ? t('Unignore this contact') : t('Ignore this contact') ),
-			'$insecure' => (($r[0]['network'] !== NETWORK_DFRN && $r[0]['network'] !== NETWORK_MAIL && $r[0]['network'] !== NETWORK_FACEBOOK) ? $insecure : ''),
+			'$insecure' => (($r[0]['network'] !== NETWORK_DFRN && $r[0]['network'] !== NETWORK_MAIL && $r[0]['network'] !== NETWORK_FACEBOOK && $r[0]['network'] !== NETWORK_DIASPORA) ? $insecure : ''),
 			'$info' => $r[0]['info'],
 			'$blocked' => (($r[0]['blocked']) ? '<div id="block-message">' . t('Currently blocked') . '</div>' : ''),
 			'$ignored' => (($r[0]['readonly']) ? '<div id="ignore-message">' . t('Currently ignored') . '</div>' : ''),
diff --git a/mod/notifications.php b/mod/notifications.php
index 07403d4b4d..8c32ee8628 100644
--- a/mod/notifications.php
+++ b/mod/notifications.php
@@ -129,9 +129,11 @@ function notifications_content(&$a) {
 			$knowyou   = '';
 			$dfrn_text = '';
 						
-			if($rr['network'] === NETWORK_DFRN) {
-				$knowyou = t('Claims to be known to you: ') . (($rr['knowyou']) ? t('yes') : t('no'));
-
+			if($rr['network'] === NETWORK_DFRN || $rr['network'] === NETWORK_DIASPORA) {
+				if($rr['network'] === NETWORK_DFRN)
+					$knowyou = t('Claims to be known to you: ') . (($rr['knowyou']) ? t('yes') : t('no'));
+				else
+					$knowyou = '';
 				$dfrn_text = replace_macros($dfrn_tpl,array(
 					'$intro_id' => $rr['intro_id'],
 					'$friend_selected' => $friend_selected,