Fix for remote authentication when visiting contact's pages

[friendica.git] / mod / profile.php

diff --git a/mod/profile.php b/mod/profile.php
index abbe65ccba2b7bbd9785aa14a03f20f788057aad..2c11f43b9c442273bdf53985df44d4091ed555b3 100644 (file)
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -150,42 +150,17 @@ function profile_content(App $a, $update = 0)
                Nav::setSelected('home');
        }
 
-       $contact = null;
-       $remote_contact = false;
-
-       $contact_id = 0;
-
-       if (!empty($_SESSION['remote'])) {
-               foreach ($_SESSION['remote'] as $v) {
-                       if ($v['uid'] == $a->profile['profile_uid']) {
-                               $contact_id = $v['cid'];
-                               break;
-                       }
-               }
-       }
-
-       if ($contact_id) {
-               $groups = Group::getIdsByContactId($contact_id);
-               $r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
-                       intval($contact_id),
-                       intval($a->profile['profile_uid'])
-               );
-               if (DBA::isResult($r)) {
-                       $contact = $r[0];
-                       $remote_contact = true;
-               }
-       }
+       $remote_contact = Contact::isFollower(remote_user(), $a->profile['profile_uid']);
+       $is_owner = local_user() == $a->profile['profile_uid'];
+       $last_updated_key = "profile:" . $a->profile['profile_uid'] . ":" . local_user() . ":" . remote_user();
 
-       if (!$remote_contact) {
-               if (local_user()) {
-                       $contact_id = $_SESSION['cid'];
-                       $contact = $a->contact;
+       if ($remote_contact) {
+               $cdata = Contact::getPublicAndUserContacID(remote_user(), $a->profile['profile_uid']);
+               if (!empty($cdata['user'])) {
+                       $groups = Group::getIdsByContactId($cdata['user']);
                }
        }
 
-       $is_owner = local_user() == $a->profile['profile_uid'];
-       $last_updated_key = "profile:" . $a->profile['profile_uid'] . ":" . local_user() . ":" . remote_user();
-
        if (!empty($a->profile['hidewall']) && !$is_owner && !$remote_contact) {
                notice(L10n::t('Access to this profile has been restricted.') . EOL);
                return;