From a8a37a35dbf799a4a85a8236063f79a8befedb3f Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Fri, 20 Feb 2015 23:12:04 +0100 Subject: [PATCH 1/3] Only show the options that fit to the current network. --- mod/contacts.php | 14 ++++++++++---- view/templates/contact_edit.tpl | 19 ++++++++++++------- 2 files changed, 22 insertions(+), 11 deletions(-) diff --git a/mod/contacts.php b/mod/contacts.php index 300331a9d..f7379d0c8 100644 --- a/mod/contacts.php +++ b/mod/contacts.php @@ -424,7 +424,7 @@ function contacts_content(&$a) { $lblsuggest = (($contact['network'] === NETWORK_DFRN) ? t('Suggest friends') : ''); - $poll_enabled = (($contact['network'] !== NETWORK_DIASPORA) ? true : false); + $poll_enabled = in_array($contact['network'], array(NETWORK_DFRN, NETWORK_OSTATUS, NETWORK_FEED, NETWORK_MAIL, NETWORK_MAIL2)); $nettype = sprintf( t('Network type: %s'),network_to_name($contact['network'])); @@ -469,6 +469,13 @@ function contacts_content(&$a) { $lost_contact = (($contact['archive'] && $contact['term-date'] != '0000-00-00 00:00:00' && $contact['term-date'] < datetime_convert('','','now')) ? t('Communications lost with this contact!') : ''); + if ($contact['network'] == NETWORK_FEED) + $fetch_further_information = array('fetch_further_information', t('Fetch further information for feeds'), $contact['fetch_further_information'], t('Fetch further information for feeds'), + array('0'=>t('Disabled'), '1'=>t('Fetch information'), '2'=>t('Fetch information and keywords'))); + + if (in_array($contact['network'], array(NETWORK_FEED, NETWORK_MAIL, NETWORK_MAIL2))) + $poll_interval = contact_poll_interval($contact['priority'],(! $poll_enabled)); + $o .= replace_macros($tpl, array( '$header' => t('Contact Editor'), '$tab_str' => $tab_str, @@ -489,7 +496,7 @@ function contacts_content(&$a) { '$lblsuggest' => $lblsuggest, '$delete' => t('Delete contact'), '$nettype' => $nettype, - '$poll_interval' => contact_poll_interval($contact['priority'],(! $poll_enabled)), + '$poll_interval' => $poll_interval, '$poll_enabled' => $poll_enabled, '$lastupdtext' => t('Last update:'), '$lost_contact' => $lost_contact, @@ -507,8 +514,7 @@ function contacts_content(&$a) { '$archived' => (($contact['archive']) ? t('Currently archived') : ''), '$hidden' => array('hidden', t('Hide this contact from others'), ($contact['hidden'] == 1), t('Replies/likes to your public posts may 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' => array('fetch_further_information', t('Fetch further information for feeds'), $contact['fetch_further_information'], t('Fetch further information for feeds'), - array('0'=>t('Disabled'), '1'=>t('Fetch information'), '2'=>t('Fetch information and keywords'))), + '$fetch_further_information' => $fetch_further_information, '$ffi_keyword_blacklist' => $contact['ffi_keyword_blacklist'], '$ffi_keyword_blacklist' => array('ffi_keyword_blacklist', t('Blacklisted keywords'), $contact['ffi_keyword_blacklist'], t('Comma separated list of keywords that should not be converted to hashtags, when "Fetch information and keywords" is selected')), '$photo' => $contact['photo'], diff --git a/view/templates/contact_edit.tpl b/view/templates/contact_edit.tpl index 65af34c6b..b43560ef7 100644 --- a/view/templates/contact_edit.tpl +++ b/view/templates/contact_edit.tpl @@ -58,16 +58,21 @@
- {{if $poll_enabled}} -
+
+ {{if $poll_enabled}}
{{$lastupdtext}} {{$last_update}}
- {{$updpub}} {{$poll_interval}} {{$udnow}} -
- {{/if}} + {{if $poll_interval}} + {{$updpub}} {{$poll_interval}} + {{/if}} + {{$udnow}} + {{/if}} +
{{include file="field_checkbox.tpl" field=$notify}} - {{include file="field_select.tpl" field=$fetch_further_information}} - {{if $fetch_further_information.2 == 2 }} {{include file="field_textarea.tpl" field=$ffi_keyword_blacklist}} {{/if}} + {{if $fetch_further_information}} + {{include file="field_select.tpl" field=$fetch_further_information}} + {{if $fetch_further_information.2 == 2 }} {{include file="field_textarea.tpl" field=$ffi_keyword_blacklist}} {{/if}} + {{/if}} {{include file="field_checkbox.tpl" field=$hidden}}
From 1dc961713d0139971207c8556cb18c5e4ce3f013 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Fri, 20 Feb 2015 23:33:21 +0100 Subject: [PATCH 2/3] Bugfix: If "all" is selected then no contacts were shown. --- mod/contacts.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mod/contacts.php b/mod/contacts.php index f7379d0c8..515d9d5dc 100644 --- a/mod/contacts.php +++ b/mod/contacts.php @@ -44,6 +44,9 @@ function contacts_init(&$a) { $follow_widget = follow_widget(); } + if ($_GET['nets'] == "all") + $_GET['nets'] = ""; + $groups_widget .= group_side('contacts','group',false,0,$contact_id); $findpeople_widget .= findpeople_widget(); $networks_widget .= networks_widget('contacts',$_GET['nets']); From 8179f2f65ee589351f1ee6368c1230382898be50 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Fri, 20 Feb 2015 23:56:41 +0100 Subject: [PATCH 3/3] Only show the relation on native networks. --- mod/contacts.php | 3 +++ view/templates/contact_edit.tpl | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/mod/contacts.php b/mod/contacts.php index 515d9d5dc..ea16e1475 100644 --- a/mod/contacts.php +++ b/mod/contacts.php @@ -405,6 +405,9 @@ function contacts_content(&$a) { break; } + if(!in_array($contact['network'], array(NETWORK_DFRN, NETWORK_OSTATUS, NETWORK_DIASPORA))) + $relation_text = ""; + $relation_text = sprintf($relation_text,$contact['name']); if(($contact['network'] === NETWORK_DFRN) && ($contact['rel'])) { diff --git a/view/templates/contact_edit.tpl b/view/templates/contact_edit.tpl index b43560ef7..9d5063146 100644 --- a/view/templates/contact_edit.tpl +++ b/view/templates/contact_edit.tpl @@ -16,7 +16,9 @@