Merge pull request #5830 from nupplaphil/update_from_boot

[friendica.git] / mod / salmon.php

diff --git a/mod/salmon.php b/mod/salmon.php
index d07b06004d130f863cae45daec499fc2c95f3b53..23e4e88846e287867d6ed5f77a147e561096ecb6 100644 (file)
--- a/mod/salmon.php
+++ b/mod/salmon.php
@@ -3,6 +3,7 @@
  * @file mod/salmon.php
  */
 use Friendica\App;
+use Friendica\Core\Logger;
 use Friendica\Core\PConfig;
 use Friendica\Core\Protocol;
 use Friendica\Core\System;
@@ -20,7 +21,7 @@ function salmon_post(App $a, $xml = '') {
                $xml = file_get_contents('php://input');
        }
 
-       logger('new salmon ' . $xml, LOGGER_DATA);
+       Logger::log('new salmon ' . $xml, Logger::DATA);
 
        $nick       = (($a->argc > 1) ? notags(trim($a->argv[1])) : '');
        $mentions   = (($a->argc > 2 && $a->argv[2] === 'mention') ? true : false);
@@ -41,15 +42,15 @@ function salmon_post(App $a, $xml = '') {
        $base = null;
 
        // figure out where in the DOM tree our data is hiding
-       if($dom->provenance->data)
+       if (!empty($dom->provenance->data))
                $base = $dom->provenance;
-       elseif($dom->env->data)
+       elseif (!empty($dom->env->data))
                $base = $dom->env;
-       elseif($dom->data)
+       elseif (!empty($dom->data))
                $base = $dom;
 
-       if(! $base) {
-               logger('unable to locate salmon data in xml ');
+       if (empty($base)) {
+               Logger::log('unable to locate salmon data in xml ');
                System::httpExit(400);
        }
 
@@ -87,18 +88,18 @@ function salmon_post(App $a, $xml = '') {
        $author_link = $author["author-link"];
 
        if(! $author_link) {
-               logger('Could not retrieve author URI.');
+               Logger::log('Could not retrieve author URI.');
                System::httpExit(400);
        }
 
        // Once we have the author URI, go to the web and try to find their public key
 
-       logger('Fetching key for ' . $author_link);
+       Logger::log('Fetching key for ' . $author_link);
 
        $key = Salmon::getKey($author_link, $keyhash);
 
        if(! $key) {
-               logger('Could not retrieve author key.');
+               Logger::log('Could not retrieve author key.');
                System::httpExit(400);
        }
 
@@ -107,7 +108,7 @@ function salmon_post(App $a, $xml = '') {
        $m = base64url_decode($key_info[1]);
        $e = base64url_decode($key_info[2]);
 
-       logger('key details: ' . print_r($key_info,true), LOGGER_DEBUG);
+       Logger::log('key details: ' . print_r($key_info,true), Logger::DEBUG);
 
        $pubkey = Crypto::meToPem($m, $e);
 
@@ -118,23 +119,23 @@ function salmon_post(App $a, $xml = '') {
        $mode = 1;
 
        if (! $verify) {
-               logger('message did not verify using protocol. Trying compliant format.');
+               Logger::log('message did not verify using protocol. Trying compliant format.');
                $verify = Crypto::rsaVerify($compliant_format, $signature, $pubkey);
                $mode = 2;
        }
 
        if (! $verify) {
-               logger('message did not verify using padding. Trying old statusnet format.');
+               Logger::log('message did not verify using padding. Trying old statusnet format.');
                $verify = Crypto::rsaVerify($stnet_signed_data, $signature, $pubkey);
                $mode = 3;
        }
 
        if (! $verify) {
-               logger('Message did not verify. Discarding.');
+               Logger::log('Message did not verify. Discarding.');
                System::httpExit(400);
        }
 
-       logger('Message verified with mode '.$mode);
+       Logger::log('Message verified with mode '.$mode);
 
 
        /*
@@ -155,7 +156,7 @@ function salmon_post(App $a, $xml = '') {
        );
 
        if (!DBA::isResult($r)) {
-               logger('Author ' . $author_link . ' unknown to user ' . $importer['uid'] . '.');
+               Logger::log('Author ' . $author_link . ' unknown to user ' . $importer['uid'] . '.');
 
                if (PConfig::get($importer['uid'], 'system', 'ostatus_autofriend')) {
                        $result = Contact::createFromProbe($importer['uid'], $author_link);
@@ -177,7 +178,7 @@ function salmon_post(App $a, $xml = '') {
 
        //if((DBA::isResult($r)) && (($r[0]['readonly']) || ($r[0]['rel'] == Contact::FOLLOWER) || ($r[0]['blocked']))) {
        if (DBA::isResult($r) && $r[0]['blocked']) {
-               logger('Ignoring this author.');
+               Logger::log('Ignoring this author.');
                System::httpExit(202);
                // NOTREACHED
        }