Merge pull request #9577 from annando/updateprofile

[friendica.git] / src / Module / Contact / Advanced.php

diff --git a/src/Module/Contact/Advanced.php b/src/Module/Contact/Advanced.php
index be1e874a57939c98af964e20e703970a01914017..b37a9affc95abf8a814c69defa784a9bebdfeae1 100644 (file)
--- a/src/Module/Contact/Advanced.php
+++ b/src/Module/Contact/Advanced.php
@@ -63,7 +63,6 @@ class Advanced extends BaseModule
                $poll        = $_POST['poll'] ?? '';
                $attag       = $_POST['attag'] ?? '';
                $photo       = $_POST['photo'] ?? '';
-               $remote_self = $_POST['remote_self'] ?? false;
                $nurl        = Strings::normaliseLink($url);
 
                $r = DI::dba()->update(
@@ -79,7 +78,6 @@ class Advanced extends BaseModule
                                'notify'      => $notify,
                                'poll'        => $poll,
                                'attag'       => $attag,
-                               'remote_self' => $remote_self,
                        ],
                        ['id' => $contact['id'], 'uid' => local_user()]
                );
@@ -113,19 +111,15 @@ class Advanced extends BaseModule
 
                $returnaddr = "contact/$cid";
 
-               // Disable remote self for everything except feeds.
-               // There is an issue when you repeat an item from maybe twitter and you got comments from friendica and twitter
-               // Problem is, you couldn't reply to both networks.
-               $allow_remote_self = in_array($contact['network'], [Protocol::FEED, Protocol::DFRN, Protocol::DIASPORA, Protocol::TWITTER])
-                                    && DI::config()->get('system', 'allow_users_remote_self');
-
-               if ($contact['network'] == Protocol::FEED) {
-                       $remote_self_options = ['0' => DI::l10n()->t('No mirroring'), '1' => DI::l10n()->t('Mirror as forwarded posting'), '2' => DI::l10n()->t('Mirror as my own posting')];
+               // This data is fetched automatically for most networks.
+               // Editing does only makes sense for mail and feed contacts.
+               if (!in_array($contact['network'], [Protocol::FEED, Protocol::MAIL])) {
+                       $readonly = 'readonly';
                } else {
-                       $remote_self_options = ['0' => DI::l10n()->t('No mirroring'), '2' => DI::l10n()->t('Mirror as my own posting')];
+                       $readonly = '';
                }
 
-               $tab_str = Contact::getTabsHTML(DI::app(), $contact, 6);
+               $tab_str = Contact::getTabsHTML($contact, Contact::TAB_ADVANCED);
 
                $tpl = Renderer::getMarkupTemplate('contact/advanced.tpl');
                return Renderer::replaceMacros($tpl, [
@@ -134,29 +128,19 @@ class Advanced extends BaseModule
                        '$info'              => $info,
                        '$returnaddr'        => $returnaddr,
                        '$return'            => DI::l10n()->t('Return to contact editor'),
-                       '$update_profile'    => in_array($contact['network'], Protocol::FEDERATED),
-                       '$udprofilenow'      => DI::l10n()->t('Refetch contact data'),
                        '$contact_id'        => $contact['id'],
                        '$lbl_submit'        => DI::l10n()->t('Submit'),
-                       '$label_remote_self' => DI::l10n()->t('Remote Self'),
-                       '$allow_remote_self' => $allow_remote_self,
-                       '$remote_self'       => ['remote_self',
-                               DI::l10n()->t('Mirror postings from this contact'),
-                               $contact['remote_self'],
-                               DI::l10n()->t('Mark this contact as remote_self, this will cause friendica to repost new entries from this contact.'),
-                               $remote_self_options
-                       ],
 
-                       '$name'    => ['name', DI::l10n()->t('Name'), $contact['name']],
-                       '$nick'    => ['nick', DI::l10n()->t('Account Nickname'), $contact['nick']],
+                       '$name'    => ['name', DI::l10n()->t('Name'), $contact['name'], '', '', $readonly],
+                       '$nick'    => ['nick', DI::l10n()->t('Account Nickname'), $contact['nick'], '', '', $readonly],
                        '$attag'   => ['attag', DI::l10n()->t('@Tagname - overrides Name/Nickname'), $contact['attag']],
-                       '$url'     => ['url', DI::l10n()->t('Account URL'), $contact['url']],
-                       '$alias'   => ['alias', DI::l10n()->t('Account URL Alias'), $contact['alias']],
-                       '$request' => ['request', DI::l10n()->t('Friend Request URL'), $contact['request']],
-                       'confirm'  => ['confirm', DI::l10n()->t('Friend Confirm URL'), $contact['confirm']],
-                       'notify'   => ['notify', DI::l10n()->t('Notification Endpoint URL'), $contact['notify']],
-                       'poll'     => ['poll', DI::l10n()->t('Poll/Feed URL'), $contact['poll']],
-                       'photo'    => ['photo', DI::l10n()->t('New photo from this URL'), ''],
+                       '$url'     => ['url', DI::l10n()->t('Account URL'), $contact['url'], '', '', $readonly],
+                       '$alias'   => ['alias', DI::l10n()->t('Account URL Alias'), $contact['alias'], '', '', $readonly],
+                       '$request' => ['request', DI::l10n()->t('Friend Request URL'), $contact['request'], '', '', $readonly],
+                       'confirm'  => ['confirm', DI::l10n()->t('Friend Confirm URL'), $contact['confirm'], '', '', $readonly],
+                       'notify'   => ['notify', DI::l10n()->t('Notification Endpoint URL'), $contact['notify'], '', '', $readonly],
+                       'poll'     => ['poll', DI::l10n()->t('Poll/Feed URL'), $contact['poll'], '', '', $readonly],
+                       'photo'    => ['photo', DI::l10n()->t('New photo from this URL'), '', '', '', $readonly],
                ]);
        }
 }