Merge pull request #6548 from MrPetovan/bug/frio-fix-help-toc

[friendica.git] / mod / dfrn_confirm.php

diff --git a/mod/dfrn_confirm.php b/mod/dfrn_confirm.php
index c78cf45e721e9cd36f9f2b5d32cf8efec3ea39f7..770c7070b44fea2ad68df07da10f1e568783ee3c 100644 (file)
--- a/mod/dfrn_confirm.php
+++ b/mod/dfrn_confirm.php
@@ -202,11 +202,11 @@ function dfrn_confirm_post(App $a, $handsfree = null)
                                $params['duplex'] = 1;
                        }
 
-                       if ($user['page-flags'] == Contact::PAGE_COMMUNITY) {
+                       if ($user['page-flags'] == User::PAGE_FLAGS_COMMUNITY) {
                                $params['page'] = 1;
                        }
 
-                       if ($user['page-flags'] == Contact::PAGE_PRVGROUP) {
+                       if ($user['page-flags'] == User::PAGE_FLAGS_PRVGROUP) {
                                $params['page'] = 2;
                        }
 
@@ -337,7 +337,12 @@ function dfrn_confirm_post(App $a, $handsfree = null)
                } else {
                        if ($network == Protocol::ACTIVITYPUB) {
                                ActivityPub\Transmitter::sendContactAccept($contact['url'], $contact['hub-verify'], $uid);
-                               $pending = true;
+                               // Setting "pending" to true on a bidirectional contact request could create a problem when it isn't accepted on the other side
+                               // Then we have got a situation where - although one direction is accepted - the contact still appears as pending.
+                               // Possibly we need two different "pending" fields, one for incoming, one for outgoing?
+                               // This has to be thought over, but for now this here is a better solution.
+                               // $pending = $duplex;
+                               $pending = false;
                        } else {
                                $pending = false;
                        }