We can now return a list of known servers

[friendica.git] / mod / dfrn_notify.php

diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php
index 7623b366cb92b9d24d6243b3fc92e7483f94653b..d34c959f1f4dbd16094871e348de7cf7230be8a0 100644 (file)
--- a/mod/dfrn_notify.php
+++ b/mod/dfrn_notify.php
@@ -1,14 +1,18 @@
 <?php
 
+/**
+ * @file mod/dfrn_notify.php
+ * @brief The dfrn notify endpoint
+ * @see PDF with dfrn specs: https://github.com/friendica/friendica/blob/master/spec/dfrn2.pdf
+ */
 require_once('include/items.php');
 require_once('include/dfrn.php');
 require_once('include/event.php');
 
 require_once('library/defuse/php-encryption-1.2.1/Crypto.php');
 
-if(! function_exists('dfrn_notify_post')) {
-function dfrn_notify_post(&$a) {
-    logger(__function__, LOGGER_TRACE);
+function dfrn_notify_post(App $a) {
+       logger(__function__, LOGGER_TRACE);
        $dfrn_id      = ((x($_POST,'dfrn_id'))      ? notags(trim($_POST['dfrn_id']))   : '');
        $dfrn_version = ((x($_POST,'dfrn_version')) ? (float) $_POST['dfrn_version']    : 2.0);
        $challenge    = ((x($_POST,'challenge'))    ? notags(trim($_POST['challenge'])) : '');
@@ -38,7 +42,7 @@ function dfrn_notify_post(&$a) {
                dbesc($dfrn_id),
                dbesc($challenge)
        );
-       if(! count($r)) {
+       if (! dbm::is_result($r)) {
                logger('dfrn_notify: could not match challenge to dfrn_id ' . $dfrn_id . ' challenge=' . $challenge);
                xml_status(3);
        }
@@ -84,7 +88,7 @@ function dfrn_notify_post(&$a) {
                dbesc($a->argv[1])
        );
 
-       if(! count($r)) {
+       if (! dbm::is_result($r)) {
                logger('dfrn_notify: contact not found for dfrn_id ' . $dfrn_id);
                xml_status(3);
                //NOTREACHED
@@ -118,7 +122,7 @@ function dfrn_notify_post(&$a) {
 
        if($dissolve == 1) {
 
-               /**
+               /*
                 * Relationship is dissolved permanently
                 */
 
@@ -215,10 +219,9 @@ function dfrn_notify_post(&$a) {
 
        // NOTREACHED
 }
-}
 
-if(! function_exists('dfrn_notify_content')) {
-function dfrn_notify_content(&$a) {
+
+function dfrn_notify_content(App $a) {
 
        if(x($_GET,'dfrn_id')) {
 
@@ -281,8 +284,9 @@ function dfrn_notify_content(&$a) {
                                dbesc($a->argv[1])
                );
 
-               if(! count($r))
+               if (! dbm::is_result($r)) {
                        $status = 1;
+               }
 
                logger("Remote rino version: ".$rino_remote." for ".$r[0]["url"], LOGGER_DEBUG);
 
@@ -341,5 +345,5 @@ function dfrn_notify_content(&$a) {
 
                killme();
        }
-}
+
 }