Make the automatic title appending optional

diff --git a/mod/settings.php b/mod/settings.php
index 5ae4086b61741e48ce7145b555a06f073f2569de..bfe228f21dad914269ea344bee35fa4d900affa1 100644 (file)
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -240,6 +240,7 @@ function settings_post(App $a)
                        PConfig::set(local_user(), 'system', 'disable_cw', intval($_POST['disable_cw']));
                        PConfig::set(local_user(), 'system', 'no_intelligent_shortening', intval($_POST['no_intelligent_shortening']));
                        PConfig::set(local_user(), 'system', 'ostatus_autofriend', intval($_POST['snautofollow']));
+                       PConfig::set(local_user(), 'system', 'append_title', intval($_POST['append_title']));
                        PConfig::set(local_user(), 'ostatus', 'default_group', $_POST['group-selection']);
                        PConfig::set(local_user(), 'ostatus', 'legacy_contact', $_POST['legacy_contact']);
                } elseif (!empty($_POST['imap-submit'])) {
@@ -783,6 +784,7 @@ function settings_content(App $a)
                $disable_cw                = intval(PConfig::get(local_user(), 'system', 'disable_cw'));
                $no_intelligent_shortening = intval(PConfig::get(local_user(), 'system', 'no_intelligent_shortening'));
                $ostatus_autofriend        = intval(PConfig::get(local_user(), 'system', 'ostatus_autofriend'));
+               $append_title              = intval(PConfig::get(local_user(), 'system', 'append_title'));
                $default_group             = PConfig::get(local_user(), 'ostatus', 'default_group');
                $legacy_contact            = PConfig::get(local_user(), 'ostatus', 'legacy_contact');
 
@@ -841,6 +843,7 @@ function settings_content(App $a)
                        '$accept_only_sharer' => ['accept_only_sharer', L10n::t('Accept only top level posts by contacts you follow'), $accept_only_sharer, L10n::t('The system does an auto completion of threads when a comment arrives. This has got the side effect that you can receive posts that had been started by a non-follower but had been commented by someone you follow. This setting deactivates this behaviour. When activated, you strictly only will receive posts from people you really do follow.')],
                        '$disable_cw' => ['disable_cw', L10n::t('Disable Content Warning'), $disable_cw, L10n::t('Users on networks like Mastodon or Pleroma are able to set a content warning field which collapse their post by default. This disables the automatic collapsing and sets the content warning as the post title. Doesn\'t affect any other content filtering you eventually set up.')],
                        '$no_intelligent_shortening' => ['no_intelligent_shortening', L10n::t('Disable intelligent shortening'), $no_intelligent_shortening, L10n::t('Normally the system tries to find the best link to add to shortened posts. If this option is enabled then every shortened post will always point to the original friendica post.')],
+                       '$append_title' => ['append_title', L10n::t('Append the title'), $accept_only_sharer, L10n::t('When activated, the title of the attached link will be added as a title on posts to Diaspora. This is mostly helpful with "remote-self" contacts that share feed content.')],
                        '$ostatus_autofriend' => ['snautofollow', L10n::t("Automatically follow any GNU Social \x28OStatus\x29 followers/mentioners"), $ostatus_autofriend, L10n::t('If you receive a message from an unknown OStatus user, this option decides what to do. If it is checked, a new contact will be created for every unknown user.')],
                        '$default_group' => Group::displayGroupSelection(local_user(), $default_group, L10n::t("Default group for OStatus contacts")),
                        '$legacy_contact' => ['legacy_contact', L10n::t('Your legacy GNU Social account'), $legacy_contact, L10n::t("If you enter your old GNU Social/Statusnet account name here \x28in the format user@domain.tld\x29, your contacts will be added automatically. The field will be emptied when done.")],

diff --git a/src/Protocol/Diaspora.php b/src/Protocol/Diaspora.php
index 6d9860471c9b9572cd56419e48cffe98193d0fec..6a1520521585913e7bc2371f9b8c2f5c02a88357 100644 (file)
--- a/src/Protocol/Diaspora.php
+++ b/src/Protocol/Diaspora.php
@@ -3585,7 +3585,7 @@ class Diaspora
                        $body = $item["body"];
 
                        // Fetch the title from an attached link - if there is one
-                       if (empty($item["title"])) {
+                       if (empty($item["title"]) && PConfig::get($owner['uid'], 'system', 'append_title')) {
                                $page_data = BBCode::getAttachmentData($item['body']);
                                if (!empty($page_data['type']) && !empty($page_data['title']) && ($page_data['type'] == 'link')) {
                                        $title = $page_data['title'];

diff --git a/view/templates/settings/connectors.tpl b/view/templates/settings/connectors.tpl
index 28f9ffab198c80701fee3264768d527c4099876b..7d168c5449a7cb572551a1ff1e5d4228ebcb1d31 100644 (file)
--- a/view/templates/settings/connectors.tpl
+++ b/view/templates/settings/connectors.tpl
@@ -14,6 +14,7 @@
        {{include file="field_checkbox.tpl" field=$accept_only_sharer}}
        {{include file="field_checkbox.tpl" field=$disable_cw}}
        {{include file="field_checkbox.tpl" field=$no_intelligent_shortening}}
+       {{include file="field_checkbox.tpl" field=$append_title}}
        {{include file="field_checkbox.tpl" field=$ostatus_autofriend}}
        {{$default_group nofilter}}
        {{include file="field_input.tpl" field=$legacy_contact}}

diff --git a/view/theme/frio/templates/settings/connectors.tpl b/view/theme/frio/templates/settings/connectors.tpl
index 30c2ca6b4af360b80805315c89a29b28af222476..b23ecd29c5685df38a707c39055005b362b42e83 100644 (file)
--- a/view/theme/frio/templates/settings/connectors.tpl
+++ b/view/theme/frio/templates/settings/connectors.tpl
@@ -26,6 +26,8 @@
 
                                                {{include file="field_checkbox.tpl" field=$no_intelligent_shortening}}
 
+                                               {{include file="field_checkbox.tpl" field=$append_title}}
+
                                                {{include file="field_checkbox.tpl" field=$ostatus_autofriend}}
 
                                                {{$default_group nofilter}}