clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Public contacts are not permitted for suggestions or mails

This commit is contained in:
Michael 2018-04-01 05:07:35 +00:00
parent 7dd64dd465
commit f51a254ed0
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/Protocol/DFRN.php
View File

@ -2681,6 +2681,10 @@ class DFRN
return true; return true;
} }
} else { // $entrytype == DFRN_TOP_LEVEL } else { // $entrytype == DFRN_TOP_LEVEL
if ($importer["readonly"]) {
logger('ignoring read-only contact '.$importer["id"]);
return;
}
if ($importer["uid"] == 0) { if ($importer["uid"] == 0) {
logger("Contact ".$importer["id"]." isn't known to user ".$importer["importer_uid"].". The post will be ignored.", LOGGER_DEBUG); logger("Contact ".$importer["id"]." isn't known to user ".$importer["importer_uid"].". The post will be ignored.", LOGGER_DEBUG);
return; return;
@ -2857,21 +2861,16 @@ class DFRN
self::processRelocation($xpath, $relocation, $importer); self::processRelocation($xpath, $relocation, $importer);
} }
if ($importer["readonly"]) { if (($importer["uid"] != 0) && !$importer["readonly"]) {
// We aren't receiving stuff from this person. But we will quietly ignore them $mails = $xpath->query("/atom:feed/dfrn:mail");
// rather than a blatant "go away" message. foreach ($mails as $mail) {
logger('ignoring contact '.$importer["id"]); self::processMail($xpath, $mail, $importer);
return 403; }
}
$mails = $xpath->query("/atom:feed/dfrn:mail"); $suggestions = $xpath->query("/atom:feed/dfrn:suggest");
foreach ($mails as $mail) { foreach ($suggestions as $suggestion) {
self::processMail($xpath, $mail, $importer); self::processSuggestion($xpath, $suggestion, $importer);
} }
$suggestions = $xpath->query("/atom:feed/dfrn:suggest");
foreach ($suggestions as $suggestion) {
self::processSuggestion($xpath, $suggestion, $importer);
} }
$deletions = $xpath->query("/atom:feed/at:deleted-entry"); $deletions = $xpath->query("/atom:feed/at:deleted-entry");