oldkid/friendica
1
0
Fork 0
mirror of https://git.sekbaer.de/Friendica/friendica.git synced 2025-06-12 01:54:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

DFRN: Improved delivery status handling

Browse source
This commit is contained in:
Michael 2017-08-16 04:08:57 +00:00
parent 0abdb26507
commit 791fc1d8b3
3 changed files with 32 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

14
include/dfrn.php
View file

@ -1281,7 +1281,11 @@ class dfrn {
$res = parse_xml_string($xml);
return $res->status;
if (!isset($res->status)) {
return -11;
}
return intval($res->status);
}
/**
@ -2800,19 +2804,20 @@ class dfrn {
* @param text $xml The DFRN message
* @param array $importer Record of the importer user mixed with contact of the content
* @param bool $sort_by_date Is used when feeds are polled
* @return integer Import status
* @todo set proper type-hints
*/
public static function import($xml,$importer, $sort_by_date = false) {
public static function import($xml, $importer, $sort_by_date = false) {
if ($xml == "") {
return;
return 400;
}
if ($importer["readonly"]) {
// We aren't receiving stuff from this person. But we will quietly ignore them
// rather than a blatant "go away" message.
logger('ignoring contact '.$importer["id"]);
return;
return 403;
}
$doc = new DOMDocument();
@ -2917,5 +2922,6 @@ class dfrn {
}
}
logger("Import done for user " . $importer["uid"] . " from contact " . $importer["id"], LOGGER_DEBUG);
return 200;
}
}