From 5f9f03daf781b95b5685a19d450800aad879c0de Mon Sep 17 00:00:00 2001 From: Friendika Date: Sun, 20 Mar 2011 19:29:01 -0700 Subject: simplify insecure network warning --- mod/contacts.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'mod/contacts.php') diff --git a/mod/contacts.php b/mod/contacts.php index 029330b7a..c1455ec54 100644 --- a/mod/contacts.php +++ b/mod/contacts.php @@ -244,6 +244,9 @@ function contacts_content(&$a) { $sparkle = ''; } + $insecure = '

' . t('Privacy Unavailable') . ' ' + . t('Private communications are not available for this contact.') . '

'; + $last_update = (($r[0]['last-update'] == '0000-00-00 00:00:00') ? t('Never') : datetime_convert('UTC',date_default_timezone_get(),$r[0]['last-update'],'D, j M Y, g:i A')); @@ -266,7 +269,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'] === 'stat') ? load_view_file('view/insecure_net.tpl') : ''), + '$insecure' => (($r[0]['network'] !== 'dfrn') ? $insecure : ''), '$info' => $r[0]['info'], '$blocked' => (($r[0]['blocked']) ? '
' . t('Currently blocked') . '
' : ''), '$ignored' => (($r[0]['readonly']) ? '
' . t('Currently ignored') . '
' : ''), -- cgit v1.2.3 From ee11a74d0b7cff5061a4d498f8ecd15e55b91b07 Mon Sep 17 00:00:00 2001 From: Friendika Date: Mon, 21 Mar 2011 21:43:22 -0700 Subject: profile match --- mod/contacts.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'mod/contacts.php') diff --git a/mod/contacts.php b/mod/contacts.php index c1455ec54..aee6548fe 100644 --- a/mod/contacts.php +++ b/mod/contacts.php @@ -9,7 +9,10 @@ function contacts_init(&$a) { $a->page['aside'] .= group_side(); if($a->config['register_policy'] != REGISTER_CLOSED) - $a->page['aside'] .= ''; + $a->page['aside'] .= ''; + + if(strlen(get_config('system','directory_submit_url'))) + $a->page['aside'] .= ''; $tpl = load_view_file('view/follow.tpl'); $a->page['aside'] .= replace_macros($tpl,array( @@ -18,6 +21,8 @@ function contacts_init(&$a) { '$follow' => t('Follow') )); + + } function contacts_post(&$a) { -- cgit v1.2.3