aboutsummaryrefslogtreecommitdiffstats
path: root/mod
diff options
context:
space:
mode:
authorFriendika <info@friendika.com>2011-08-15 19:31:45 -0700
committerFriendika <info@friendika.com>2011-08-15 19:31:45 -0700
commit8e3506048a3c8bc6fd8fb86fdbf813ff9fb3adc9 (patch)
tree0e5e8ad39b5cb14e9f9553b60694ad06dc7c5dad /mod
parentf7a1674cf6a65f9280f9e4e612f2c37cced35580 (diff)
downloadvolse-hubzilla-8e3506048a3c8bc6fd8fb86fdbf813ff9fb3adc9.tar.gz
volse-hubzilla-8e3506048a3c8bc6fd8fb86fdbf813ff9fb3adc9.tar.bz2
volse-hubzilla-8e3506048a3c8bc6fd8fb86fdbf813ff9fb3adc9.zip
diaspora confirm cleanup
Diffstat (limited to 'mod')
-rw-r--r--mod/contacts.php2
-rw-r--r--mod/notifications.php8
2 files changed, 6 insertions, 4 deletions
diff --git a/mod/contacts.php b/mod/contacts.php
index f64709ab6..f130b74c0 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 07403d4b4..8c32ee862 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,