Fixed class name

[friendica.git] / mod / salmon.php

diff --git a/mod/salmon.php b/mod/salmon.php
index 6eea57f6a7e3a3d70066e83ea49aabf240e311f9..bc4410434bbf362c14eee893fca773ade3bb0d70 100644 (file)
--- a/mod/salmon.php
+++ b/mod/salmon.php
@@ -42,15 +42,11 @@ function salmon_post(App $a, $xml = '') {
 
        $nick       = (($a->argc > 1) ? Strings::escapeTags(trim($a->argv[1])) : '');
 
-       $r = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `account_expired` = 0 AND `account_removed` = 0 LIMIT 1",
-               DBA::escape($nick)
-       );
-       if (! DBA::isResult($r)) {
+       $importer = DBA::selectFirst('user', [], ['nickname' => $nick, 'account_expired' => false, 'account_removed' => false]);
+       if (! DBA::isResult($importer)) {
                throw new \Friendica\Network\HTTPException\InternalServerErrorException();
        }
 
-       $importer = $r[0];
-
        // parse the xml
 
        $dom = simplexml_load_string($xml,'SimpleXMLElement',0, ActivityNamespace::SALMON_ME);
@@ -83,7 +79,7 @@ function salmon_post(App $a, $xml = '') {
        // stash away some other stuff for later
 
        $type = $base->data[0]->attributes()->type[0];
-       $keyhash = $base->sig[0]->attributes()->keyhash[0];
+       $keyhash = $base->sig[0]->attributes()->keyhash[0] ?? '';
        $encoding = $base->encoding;
        $alg = $base->alg;
 
@@ -124,7 +120,7 @@ function salmon_post(App $a, $xml = '') {
        $m = Strings::base64UrlDecode($key_info[1]);
        $e = Strings::base64UrlDecode($key_info[2]);
 
-       Logger::log('key details: ' . print_r($key_info,true), Logger::DEBUG);
+       Logger::info('key details', ['info' => $key_info]);
 
        $pubkey = Crypto::meToPem($m, $e);
 
@@ -175,7 +171,7 @@ function salmon_post(App $a, $xml = '') {
                Logger::log('Author ' . $author_link . ' unknown to user ' . $importer['uid'] . '.');
 
                if (DI::pConfig()->get($importer['uid'], 'system', 'ostatus_autofriend')) {
-                       $result = Contact::createFromProbe($importer['uid'], $author_link);
+                       $result = Contact::createFromProbe($importer, $author_link);
 
                        if ($result['success']) {
                                $r = q("SELECT * FROM `contact` WHERE `network` = '%s' AND ( `url` = '%s' OR `alias` = '%s')