friendica
/
friendica
kopie van https://github.com/friendica/friendica
6
0
Vork 1
Code Kwesties Packages Projecten Publicaties 1 Wiki Activiteit

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

This commit is contained in:
Michael 2018-04-21 10:39:46 +00:00
bovenliggende e2ded28504
commit fd7658a70a
1 gewijzigde bestanden met toevoegingen van 2 en 2 verwijderingen
Statistieken weergeven Download Patch-bestand Download Diff-bestand Expand all files Collapse all files

4
src/Protocol/Diaspora.php
Bestand weergeven

@ -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