X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fsalmon.php;h=1e92980f1ceb123a2ef362e97581fc780be7e816;hb=faac5b71ce210086826e395283233d1d82892398;hp=6eea57f6a7e3a3d70066e83ea49aabf240e311f9;hpb=097620b62799c96d610d73410ec07a6b8cdf82f0;p=friendica.git

diff --git a/mod/salmon.php b/mod/salmon.php
index 6eea57f6a7..1e92980f1c 100644
--- a/mod/salmon.php
+++ b/mod/salmon.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2021, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -25,6 +25,8 @@ use Friendica\Core\Protocol;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Contact;
+use Friendica\Model\GServer;
+use Friendica\Model\Post;
 use Friendica\Protocol\ActivityNamespace;
 use Friendica\Protocol\OStatus;
 use Friendica\Protocol\Salmon;
@@ -42,15 +44,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 +81,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 +122,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 +173,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')
@@ -189,6 +187,10 @@ function salmon_post(App $a, $xml = '') {
 		}
 	}
 
+	if (!empty($r[0]['gsid'])) {
+		GServer::setProtocol($r[0]['gsid'], Post\DeliveryData::OSTATUS);
+	}
+
 	// Have we ignored the person?
 	// If so we can not accept this post.