Merge pull request #4882 from annando/private-forums

Contact requests from Diaspora for private forums aren't accepted automatically anymore

diff --git a/src/Protocol/Diaspora.php b/src/Protocol/Diaspora.php
index 8120fea8a5556deddbb373346ee58ea0bb7285b3..e81c53499fa92337b41858148be96022b049eaca 100644 (file)
--- a/src/Protocol/Diaspora.php
+++ b/src/Protocol/Diaspora.php
@@ -1173,7 +1173,7 @@ class Diaspora
                        // Yes, then it is fine.
                        return true;
                        // Is it a post to a community?
-               } elseif (($contact["rel"] == CONTACT_IS_FOLLOWER) && ($importer["page-flags"] == PAGE_COMMUNITY)) {
+               } elseif (($contact["rel"] == CONTACT_IS_FOLLOWER) && in_array($importer["page-flags"], [PAGE_COMMUNITY, PAGE_PRVGROUP])) {
                        // That's good
                        return true;
                        // Is the message a global user or a comment?
@@ -2665,7 +2665,7 @@ class Diaspora
 
                Contact::updateAvatar($ret["photo"], $importer['uid'], $contact_record["id"], true);
 
-               if ($importer["page-flags"] == PAGE_NORMAL) {
+               if (in_array($importer["page-flags"], [PAGE_NORMAL, PAGE_PRVGROUP])) {
                        logger("Sending intra message for author ".$author.".", LOGGER_DEBUG);
 
                        $hash = random_string().(string)time();   // Generate a confirm_key