X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fdfrn_notify.php;h=a0ac506769be364ec10d7960598f9f75c8d59063;hb=9f2196aa1aa0dc112e3fc238832828d4e22fe137;hp=b42ef9b70a82cee1bc669945d2bd8c3c9fba0a27;hpb=48dde02e754ba1252e1d488450298d6210a549d5;p=friendica.git

diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php
index b42ef9b70a..a0ac506769 100644
--- a/mod/dfrn_notify.php
+++ b/mod/dfrn_notify.php
@@ -5,6 +5,9 @@
  * @brief The dfrn notify endpoint
  * @see PDF with dfrn specs: https://github.com/friendica/friendica/blob/master/spec/dfrn2.pdf
  */
+
+use Friendica\App;
+
 require_once('include/items.php');
 require_once('include/dfrn.php');
 require_once('include/event.php');
@@ -44,7 +47,7 @@ function dfrn_notify_post(App $a) {
 	);
 	if (! dbm::is_result($r)) {
 		logger('dfrn_notify: could not match challenge to dfrn_id ' . $dfrn_id . ' challenge=' . $challenge);
-		xml_status(3);
+		xml_status(3, 'Could not match challenge');
 	}
 
 	$r = q("DELETE FROM `challenge` WHERE `dfrn-id` = '%s' AND `challenge` = '%s'",
@@ -55,7 +58,7 @@ function dfrn_notify_post(App $a) {
 	// find the local user who owns this relationship.
 
 	$sql_extra = '';
-	switch($direction) {
+	switch ($direction) {
 		case (-1):
 			$sql_extra = sprintf(" AND ( `issued-id` = '%s' OR `dfrn-id` = '%s' ) ", dbesc($dfrn_id), dbesc($dfrn_id));
 			break;
@@ -66,7 +69,7 @@ function dfrn_notify_post(App $a) {
 			$sql_extra = sprintf(" AND `dfrn-id` = '%s' AND `duplex` = 1 ", dbesc($dfrn_id));
 			break;
 		default:
-			xml_status(3);
+			xml_status(3, 'Invalid direction');
 			break; // NOTREACHED
 	}
 
@@ -92,7 +95,7 @@ function dfrn_notify_post(App $a) {
 
 	if (! dbm::is_result($r)) {
 		logger('dfrn_notify: contact not found for dfrn_id ' . $dfrn_id);
-		xml_status(3);
+		xml_status(3, 'Contact not found');
 		//NOTREACHED
 	}
 
@@ -132,8 +135,7 @@ function dfrn_notify_post(App $a) {
 		require_once('include/Contact.php');
 		contact_remove($importer['id']);
 		logger('relationship dissolved : ' . $importer['name'] . ' dissolved ' . $importer['username']);
-		xml_status(0);
-
+		xml_status(0, 'relationship dissolved');
 	}
 
 	$rino = get_config('system', 'rino_encrypt');
@@ -147,7 +149,7 @@ function dfrn_notify_post(App $a) {
 		// but only for $remote_rino > 1, because old code did't send rino version
 		if ($rino_remote_version > 1 && $rino < $rino_remote) {
 			logger("rino version '$rino_remote' is lower than supported '$rino'");
-			xml_status(0,"rino version '$rino_remote' is lower than supported '$rino'");
+			xml_status(0, "rino version '$rino_remote' is lower than supported '$rino'");
 		}
 
 		$rawkey = hex2bin(trim($key));
@@ -201,8 +203,8 @@ function dfrn_notify_post(App $a) {
 				}
 				break;
 			default:
-				logger("rino: invalid sent verision '$rino_remote'");
-				xml_status(0);
+				logger("rino: invalid sent version '$rino_remote'");
+				xml_status(0, "Invalid sent version '$rino_remote'");
 		}
 
 
@@ -210,7 +212,7 @@ function dfrn_notify_post(App $a) {
 	}
 
 	$ret = dfrn::import($data, $importer);
-	xml_status($ret);
+	xml_status($ret, 'Processed');
 
 	// NOTREACHED
 }