Show the relations of Twitter contacts

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

diff --git a/src/Module/Contact.php b/src/Module/Contact.php
index 563adef74a836dbc53470c06b44bd9bdef773195..84420afaad9129476e6fe27831e4a0ff76932421 100644 (file)
--- a/src/Module/Contact.php
+++ b/src/Module/Contact.php
@@ -1,4 +1,23 @@
 <?php
+/**
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
 
 namespace Friendica\Module;
 
@@ -100,14 +119,6 @@ class Contact extends BaseModule
 
                Hook::callAll('contact_edit_post', $_POST);
 
-               $profile_id = intval($_POST['profile-assign'] ?? 0);
-               if ($profile_id) {
-                       if (!DBA::exists('profile', ['id' => $profile_id, 'uid' => local_user()])) {
-                               notice(DI::l10n()->t('Could not locate selected profile.') . EOL);
-                               return;
-                       }
-               }
-
                $hidden = !empty($_POST['hidden']);
 
                $notify = !empty($_POST['notify']);
@@ -124,7 +135,6 @@ class Contact extends BaseModule
                $info = Strings::escapeHtml(trim($_POST['info'] ?? ''));
 
                $r = DBA::update('contact', [
-                       'profile-id' => $profile_id,
                        'priority'   => $priority,
                        'info'       => $info,
                        'hidden'     => $hidden,
@@ -279,7 +289,7 @@ class Contact extends BaseModule
                                if (($a->argc == 3) && intval($a->argv[1]) && in_array($a->argv[2], ['posts', 'conversations'])) {
                                        DI::baseUrl()->redirect('profile/' . $contact['nick']);
                                } else {
-                                       DI::baseUrl()->redirect('profile/' . $contact['nick'] . '?tab=profile');
+                                       DI::baseUrl()->redirect('profile/' . $contact['nick'] . '/profile');
                                }
                        }
 
@@ -383,7 +393,7 @@ class Contact extends BaseModule
 
                        if ($cmd === 'updateprofile' && ($orig_record['uid'] != 0)) {
                                self::updateContactFromProbe($contact_id);
-                               DI::baseUrl()->redirect('crepair/' . $contact_id);
+                               DI::baseUrl()->redirect('contact/' . $contact_id . '/advanced/');
                                // NOTREACHED
                        }
 
@@ -503,7 +513,7 @@ class Contact extends BaseModule
                                $relation_text = '';
                        }
 
-                       if (!in_array($contact['network'], Protocol::FEDERATED)) {
+                       if (!in_array($contact['network'], array_merge(Protocol::FEDERATED, [Protocol::TWITTER]))) {
                                $relation_text = '';
                        }
 
@@ -555,20 +565,13 @@ class Contact extends BaseModule
                                $poll_interval = ContactSelector::pollInterval($contact['priority'], !$poll_enabled);
                        }
 
-                       $profile_select = null;
-                       if ($contact['network'] == Protocol::DFRN) {
-                               $profile_select = ContactSelector::profileAssign($contact['profile-id'], $contact['network'] !== Protocol::DFRN);
-                       }
-
                        // Load contactact related actions like hide, suggest, delete and others
                        $contact_actions = self::getContactActions($contact);
 
                        if ($contact['uid'] != 0) {
-                               $lbl_vis1 = DI::l10n()->t('Profile Visibility');
                                $lbl_info1 = DI::l10n()->t('Contact Information / Notes');
                                $contact_settings_label = DI::l10n()->t('Contact Settings');
                        } else {
-                               $lbl_vis1 = null;
                                $lbl_info1 = null;
                                $contact_settings_label = null;
                        }
@@ -578,8 +581,6 @@ class Contact extends BaseModule
                                '$header'         => DI::l10n()->t('Contact'),
                                '$tab_str'        => $tab_str,
                                '$submit'         => DI::l10n()->t('Submit'),
-                               '$lbl_vis1'       => $lbl_vis1,
-                               '$lbl_vis2'       => DI::l10n()->t('Please choose the profile you would like to display to %s when viewing your profile securely.', $contact['name']),
                                '$lbl_info1'      => $lbl_info1,
                                '$lbl_info2'      => DI::l10n()->t('Their personal note'),
                                '$reason'         => trim(Strings::escapeTags($contact['reason'])),
@@ -589,7 +590,6 @@ class Contact extends BaseModule
                                '$visit'          => DI::l10n()->t('Visit %s\'s profile [%s]', $contact['name'], $contact['url']),
                                '$blockunblock'   => DI::l10n()->t('Block/Unblock contact'),
                                '$ignorecont'     => DI::l10n()->t('Ignore contact'),
-                               '$lblcrepair'     => DI::l10n()->t('Repair URL settings'),
                                '$lblrecent'      => DI::l10n()->t('View conversations'),
                                '$lblsuggest'     => $lblsuggest,
                                '$nettype'        => $nettype,
@@ -600,7 +600,6 @@ class Contact extends BaseModule
                                '$updpub'         => DI::l10n()->t('Update public posts'),
                                '$last_update'    => $last_update,
                                '$udnow'          => DI::l10n()->t('Update now'),
-                               '$profile_select' => $profile_select,
                                '$contact_id'     => $contact['id'],
                                '$block_text'     => ($contact['blocked'] ? DI::l10n()->t('Unblock') : DI::l10n()->t('Block')),
                                '$ignore_text'    => ($contact['readonly'] ? DI::l10n()->t('Unignore') : DI::l10n()->t('Ignore')),
@@ -732,7 +731,7 @@ class Contact extends BaseModule
                }
                DBA::close($stmt);
 
-               $pager = new Pager(DI::args()->getQueryString());
+               $pager = new Pager(DI::l10n(), DI::args()->getQueryString());
 
                $sql_values[] = $pager->getStart();
                $sql_values[] = $pager->getItemsPerPage();
@@ -929,7 +928,7 @@ class Contact extends BaseModule
 
                if (!empty($contact['uid'])) {
                        $tabs[] = ['label' => DI::l10n()->t('Advanced'),
-                               'url'   => 'crepair/' . $contact['id'],
+                               'url'   => 'contact/' . $contact['id'] . '/advanced/',
                                'sel'   => (($active_tab == 6) ? 'active' : ''),
                                'title' => DI::l10n()->t('Advanced Contact Settings'),
                                'id'    => 'advanced-tab',
@@ -976,7 +975,7 @@ class Contact extends BaseModule
 
                        $profiledata = Model\Contact::getDetailsByURL($contact['url']);
 
-                       Model\Profile::load($a, '', 0, $profiledata, true);
+                       Model\Profile::load($a, '', $profiledata, true);
                        $o .= Model\Contact::getPostsFromUrl($contact['url'], true, $update);
                }
 
@@ -998,7 +997,7 @@ class Contact extends BaseModule
                                $profiledata['remoteconnect'] = DI::baseUrl() . '/follow?url=' . urlencode($profiledata['url']);
                        }
 
-                       Model\Profile::load($a, '', 0, $profiledata, true);
+                       Model\Profile::load($a, '', $profiledata, true);
                        $o .= Model\Contact::getPostsFromUrl($contact['url']);
                }