Only show the options that fit to the current network.

diff --git a/mod/contacts.php b/mod/contacts.php
index 300331a9dcdf19be1f09e992691ca3b3aa98f7f9..f7379d0c8a3d9613fd839592d0b4eee54302107f 100644 (file)
--- 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 <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' => 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 65af34c6bb039242b33628b88e743eddc505809a..b43560ef78e23310669b0a14713fd386f235f15e 100644 (file)
--- a/view/templates/contact_edit.tpl
+++ b/view/templates/contact_edit.tpl
@@ -58,16 +58,21 @@
 <form action="contacts/{{$contact_id}}" method="post" >
 <input type="hidden" name="contact_id" value="{{$contact_id}}">
 
-       {{if $poll_enabled}}
-               <div id="contact-edit-poll-wrapper">
+       <div id="contact-edit-poll-wrapper">
+               {{if $poll_enabled}}
                        <div id="contact-edit-last-update-text">{{$lastupdtext}} <span id="contact-edit-last-updated">{{$last_update}}</span></div>
-                       <span id="contact-edit-poll-text">{{$updpub}}</span> {{$poll_interval}} <span id="contact-edit-update-now" class="button"><a href="contacts/{{$contact_id}}/update" >{{$udnow}}</a></span>
-               </div>
-       {{/if}}
+                       {{if $poll_interval}}
+                               <span id="contact-edit-poll-text">{{$updpub}}</span> {{$poll_interval}}
+                       {{/if}}
+                       <span id="contact-edit-update-now" class="button"><a href="contacts/{{$contact_id}}/update" >{{$udnow}}</a></span>
+               {{/if}}
+       </div>
        <div id="contact-edit-end" ></div>
        {{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}}
 
 <div id="contact-edit-info-wrapper">