Merge pull request #12457 from annando/image-grid-shared

[friendica.git] / src / Model / Profile.php

diff --git a/src/Model/Profile.php b/src/Model/Profile.php
index 96932cdb0475b20b1242491c667a5c8b7168ed16..a1690648fc9e9475d29a706373db9e0f59a0496d 100644 (file)
--- a/src/Model/Profile.php
+++ b/src/Model/Profile.php
@@ -335,13 +335,13 @@ class Profile
                        if (!$visitor_is_authenticated) {
                                // Remote follow is only available for local profiles
                                if (!empty($profile['nickname']) && strpos($profile_url, DI::baseUrl()->get()) === 0) {
-                                       $follow_link = 'remote_follow/' . $profile['nickname'];
+                                       $follow_link = 'profile/' . $profile['nickname'] . '/remote_follow';
                                }
                        } else {
                                if ($visitor_is_following) {
-                                       $unfollow_link = $visitor_base_path . '/unfollow?url=' . urlencode($profile_url) . '&auto=1';
+                                       $unfollow_link = $visitor_base_path . '/contact/unfollow?url=' . urlencode($profile_url) . '&auto=1';
                                } else {
-                                       $follow_link =  $visitor_base_path .'/follow?url=' . urlencode($profile_url) . '&auto=1';
+                                       $follow_link = $visitor_base_path . '/contact/follow?url=' . urlencode($profile_url) . '&auto=1';
                                }
                        }
 
@@ -349,7 +349,7 @@ class Profile
                                if ($visitor_is_followed || $visitor_is_following) {
                                        $wallmessage_link = $visitor_base_path . '/message/new/' . $profile_contact['id'];
                                } elseif ($visitor_is_authenticated && !empty($profile['unkmail'])) {
-                                       $wallmessage_link = 'wallmessage/' . $profile['nickname'];
+                                       $wallmessage_link = 'profile/' . $profile['nickname'] . '/unkmail';
                                }
                        }
                }
@@ -451,6 +451,10 @@ class Profile
 
                $p['url'] = Contact::magicLinkById($cid, $profile['url']);
 
+               if (!isset($profile['hidewall'])) {
+                       Logger::warning('Missing hidewall key in profile array', ['profile' => $profile, 'callstack' => System::callstack(10)]);
+               }
+
                $tpl = Renderer::getMarkupTemplate('profile/vcard.tpl');
                $o .= Renderer::replaceMacros($tpl, [
                        '$profile' => $p,
@@ -461,12 +465,13 @@ class Profile
                        '$unfollow' => DI::l10n()->t('Unfollow'),
                        '$unfollow_link' => $unfollow_link,
                        '$subscribe_feed' => DI::l10n()->t('Atom feed'),
-                       '$subscribe_feed_link' => $profile['poll'],
+                       '$subscribe_feed_link' => $profile['hidewall'] ?? 0 ? '' : $profile['poll'],
                        '$wallmessage' => DI::l10n()->t('Message'),
                        '$wallmessage_link' => $wallmessage_link,
                        '$account_type' => $account_type,
                        '$location' => $location,
                        '$homepage' => $homepage,
+                       '$homepage_verified' => DI::l10n()->t('This website has been verified to belong to the same person.'),
                        '$about' => $about,
                        '$network' => DI::l10n()->t('Network:'),
                        '$contacts' => $contact_count,
@@ -679,10 +684,11 @@ class Profile
         * Retrieves the my_url session variable
         *
         * @return string
+        * @deprecated since version 2022.12, please use UserSession->getMyUrl instead
         */
        public static function getMyURL(): string
        {
-               return DI::session()->get('my_url') ?? '';
+               return DI::userSession()->getMyUrl();
        }
 
        /**