Merge pull request #3949 from annando/further-information

[friendica.git] / mod / salmon.php

diff --git a/mod/salmon.php b/mod/salmon.php
index 508cd4de65ace3477695c5efa427b709944cbb7c..919204a48b2f65fbb4348c0842c480958d42c0fc 100644 (file)
--- a/mod/salmon.php
+++ b/mod/salmon.php
@@ -1,13 +1,16 @@
 <?php
-
+/**
+ * @file mod/salmon.php
+ */
 use Friendica\App;
 use Friendica\Core\PConfig;
+use Friendica\Database\DBM;
+use Friendica\Protocol\OStatus;
 
-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');
+require_once 'include/salmon.php';
+require_once 'include/crypto.php';
+require_once 'include/items.php';
+require_once 'include/follow.php';
 
 function salmon_return($val) {
 
@@ -34,7 +37,7 @@ function salmon_post(App $a) {
        $r = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `account_expired` = 0 AND `account_removed` = 0 LIMIT 1",
                dbesc($nick)
        );
-       if (! dbm::is_result($r)) {
+       if (! DBM::is_result($r)) {
                http_status_exit(500);
        }
 
@@ -88,7 +91,7 @@ function salmon_post(App $a) {
        // decode the data
        $data = base64url_decode($data);
 
-       $author = ostatus::salmon_author($data,$importer);
+       $author = OStatus::salmonAuthor($data, $importer);
        $author_link = $author["author-link"];
 
        if(! $author_link) {
@@ -158,7 +161,7 @@ function salmon_post(App $a) {
                dbesc(normalise_link($author_link)),
                intval($importer['uid'])
        );
-       if (! dbm::is_result($r)) {
+       if (! DBM::is_result($r)) {
                logger('mod-salmon: Author unknown to us.');
                if(PConfig::get($importer['uid'],'system','ostatus_autofriend')) {
                        $result = new_contact($importer['uid'],$author_link);
@@ -177,8 +180,8 @@ function salmon_post(App $a) {
        // Have we ignored the person?
        // If so we can not accept this post.
 
-       //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']) {
+       //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
@@ -187,9 +190,9 @@ function salmon_post(App $a) {
        // Placeholder for hub discovery.
        $hub = '';
 
-       $contact_rec = ((dbm::is_result($r)) ? $r[0] : null);
+       $contact_rec = ((DBM::is_result($r)) ? $r[0] : null);
 
-       ostatus::import($data,$importer,$contact_rec, $hub);
+       OStatus::import($data, $importer, $contact_rec, $hub);
 
        http_status_exit(200);
 }