From c77a63fb2749e1ac117e5f1217c71e36a077b48b Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Fri, 24 Oct 2014 01:37:33 +0200 Subject: [PATCH] remote self: There is now an option if the keyswords should be used as tags or not. --- include/items.php | 2 +- mod/contacts.php | 7 ++++--- view/templates/contact_edit.tpl | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/include/items.php b/include/items.php index 2d6109b0f..53e8126a4 100644 --- a/include/items.php +++ b/include/items.php @@ -872,7 +872,7 @@ function get_atom_elements($feed, $item, $contact = array()) { } if (isset($contact["network"]) AND ($contact["network"] == NETWORK_FEED) AND $contact['fetch_further_information']) { - $res["body"] = $res["title"].add_page_info($res['plink'], false, "", true); + $res["body"] = $res["title"].add_page_info($res['plink'], false, "", ($contact['fetch_further_information'] == 2)); $res["title"] = ""; $res["object-type"] = ACTIVITY_OBJ_BOOKMARK; } elseif (isset($contact["network"]) AND ($contact["network"] == NETWORK_OSTATUS)) diff --git a/mod/contacts.php b/mod/contacts.php index b212803b3..51ff4ed4b 100644 --- a/mod/contacts.php +++ b/mod/contacts.php @@ -502,7 +502,8 @@ 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'] == 1), t('Fetch further information for feeds')), + '$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'))), '$photo' => $contact['photo'], '$name' => $contact['name'], '$dir_icon' => $dir_icon, @@ -684,10 +685,10 @@ function contacts_content(&$a) { ); } - + } - + $tpl = get_markup_template("contacts-template.tpl"); $o .= replace_macros($tpl, array( '$baseurl' => $a->get_baseurl(), diff --git a/view/templates/contact_edit.tpl b/view/templates/contact_edit.tpl index 7f2e92484..133912bc9 100644 --- a/view/templates/contact_edit.tpl +++ b/view/templates/contact_edit.tpl @@ -66,7 +66,7 @@ {{/if}}
{{include file="field_checkbox.tpl" field=$notify}} - {{include file="field_checkbox.tpl" field=$fetch_further_information}} + {{include file="field_select.tpl" field=$fetch_further_information}} {{include file="field_checkbox.tpl" field=$hidden}}