Fix: Empty answers in DFRN can be okay

diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php
index 734fbde628f096427333003ef5f98574ddca18f0..d1a4f0c4bef856ac140a7d616091213971192c18 100644 (file)
--- a/src/Protocol/DFRN.php
+++ b/src/Protocol/DFRN.php
@@ -1361,10 +1361,15 @@ class DFRN
 
                $res = XML::parseString($xml);
 
-               if (empty($res->status)) {
+               if (!isset($res->status)) {
                        return -11;
                }
 
+               // Possibly old servers had returned an empty value when everything was okay
+               if (empty($res->status)) {
+                       $res->status = 200;
+               }
+
                if (!empty($res->message)) {
                        logger('Delivery returned status '.$res->status.' - '.$res->message, LOGGER_DEBUG);
                }
@@ -1405,7 +1410,7 @@ class DFRN
                $fcontact = Diaspora::personByHandle($contact['addr']);
                if (empty($fcontact)) {
                        logger('Unable to find contact details for ' . $contact['id'] . ' - ' . $contact['addr']);
-                       return -21;
+                       return -22;
                }
 
                $envelope = Diaspora::buildMessage($atom, $owner, $contact, $owner['uprvkey'], $fcontact['pubkey'], $public_batch);
@@ -1435,7 +1440,7 @@ class DFRN
                $res = XML::parseString($xml);
 
                if (empty($res->status)) {
-                       return -11;
+                       return -23;
                }
 
                if (!empty($res->message)) {