Normalize App parameter declaration (mod folder, 3 out of 3)

[friendica.git] / mod / salmon.php

diff --git a/mod/salmon.php b/mod/salmon.php
index f04a2e22879d52868ac746c75b672a5fc5f9f160..69809f5234fe9007ac4f979039a48f6d242a0d7b 100644 (file)
--- a/mod/salmon.php
+++ b/mod/salmon.php
@@ -1,12 +1,10 @@
 <?php
 
-
-// There is a lot of debug stuff in here because this is quite a
-// complicated process to try and sort out.
-
 require_once('include/salmon.php');
 require_once('include/ostatus.php');
 require_once('include/crypto.php');
+require_once('include/items.php');
+require_once('include/follow.php');
 
 function salmon_return($val) {
 
@@ -21,7 +19,7 @@ function salmon_return($val) {
 
 }
 
-function salmon_post(&$a) {
+function salmon_post(App $a) {
 
        $xml = file_get_contents('php://input');
 
@@ -33,8 +31,9 @@ function salmon_post(&$a) {
        $r = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `account_expired` = 0 AND `account_removed` = 0 LIMIT 1",
                dbesc($nick)
        );
-       if(! count($r))
+       if (! dbm::is_result($r)) {
                http_status_exit(500);
+       }
 
        $importer = $r[0];
 
@@ -86,7 +85,7 @@ function salmon_post(&$a) {
        // decode the data
        $data = base64url_decode($data);
 
-       $author = ostatus_salmon_author($data,$importer);
+       $author = ostatus::salmon_author($data,$importer);
        $author_link = $author["author-link"];
 
        if(! $author_link) {
@@ -96,8 +95,7 @@ function salmon_post(&$a) {
 
        // Once we have the author URI, go to the web and try to find their public key
 
-       logger('mod-salmon: Fetching key for ' . $author_link );
-
+       logger('mod-salmon: Fetching key for ' . $author_link);
 
        $key = get_salmon_key($author_link,$keyhash);
 
@@ -153,13 +151,12 @@ function salmon_post(&$a) {
                dbesc(normalise_link($author_link)),
                intval($importer['uid'])
        );
-       if(! count($r)) {
+       if (! dbm::is_result($r)) {
                logger('mod-salmon: Author unknown to us.');
                if(get_pconfig($importer['uid'],'system','ostatus_autofriend')) {
-                       require_once('include/follow.php');
                        $result = new_contact($importer['uid'],$author_link);
                        if($result['success']) {
-                               $r = q("SELECT * FROM `contact` WHERE `network` = '%s' AND ( `url` = '%s' OR `alias` = '%s' ) 
+                               $r = q("SELECT * FROM `contact` WHERE `network` = '%s' AND ( `url` = '%s' OR `alias` = '%s')
                                        AND `uid` = %d LIMIT 1",
                                        dbesc(NETWORK_OSTATUS),
                                        dbesc($author_link),
@@ -170,33 +167,22 @@ function salmon_post(&$a) {
                }
        }
 
-       // is this a follower? Or have we ignored the person?
+       // Have we ignored the person?
        // If so we can not accept this post.
 
-       if((count($r)) && (($r[0]['readonly']) || ($r[0]['rel'] == CONTACT_IS_FOLLOWER) || ($r[0]['blocked']))) {
+       //if((dbm::is_result($r)) && (($r[0]['readonly']) || ($r[0]['rel'] == CONTACT_IS_FOLLOWER) || ($r[0]['blocked']))) {
+       if (dbm::is_result($r) && $r[0]['blocked']) {
                logger('mod-salmon: Ignoring this author.');
                http_status_exit(202);
                // NOTREACHED
        }
 
-       require_once('include/items.php');
-
-       // Placeholder for hub discovery. We shouldn't find any hubs
-       // since we supplied the fake feed header - and it doesn't have any.
-
+       // Placeholder for hub discovery.
        $hub = '';
 
-       /**
-        *
-        * anti-spam measure: consume_feed will accept a follow activity from 
-        * this person (and nothing else) if there is no existing contact record.
-        *
-        */
-
-       $contact_rec = ((count($r)) ? $r[0] : null);
+       $contact_rec = ((dbm::is_result($r)) ? $r[0] : null);
 
-       //consume_feed($feedxml,$importer,$contact_rec,$hub);
-       ostatus_import($data,$importer,$contact_rec, $hub);
+       ostatus::import($data,$importer,$contact_rec, $hub);
 
        http_status_exit(200);
 }