X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fsalmon.php;h=e9ab311c993eb01f3c843f7407e886ced8700e3a;hb=b521e45903544f15443d9f77bfe684c67d139873;hp=67e467a73fea89ceb7c9aa1dd03c50997f386129;hpb=0a82fe4211f73cf10107feb69fe38eaa85eb61f8;p=friendica.git

diff --git a/mod/salmon.php b/mod/salmon.php
index 67e467a73f..e9ab311c99 100644
--- a/mod/salmon.php
+++ b/mod/salmon.php
@@ -1,19 +1,38 @@
 <?php
 /**
- * @file mod/salmon.php
+ * @copyright Copyright (C) 2010-2021, the Friendica project
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
  */
+
 use Friendica\App;
 use Friendica\Core\Logger;
-use Friendica\Core\PConfig;
 use Friendica\Core\Protocol;
-use Friendica\Core\System;
 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;
 use Friendica\Util\Crypto;
-use Friendica\Util\Strings;
 use Friendica\Util\Network;
+use Friendica\Util\Strings;
 
 function salmon_post(App $a, $xml = '') {
 
@@ -23,20 +42,16 @@ function salmon_post(App $a, $xml = '') {
 
 	Logger::log('new salmon ' . $xml, Logger::DATA);
 
-	$nick       = (($a->argc > 1) ? Strings::escapeTags(trim($a->argv[1])) : '');
+	$nick       = ((DI::args()->getArgc() > 1) ? Strings::escapeTags(trim(DI::args()->getArgv()[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,NAMESPACE_SALMON_ME);
+	$dom = simplexml_load_string($xml,'SimpleXMLElement',0, ActivityNamespace::SALMON_ME);
 
 	$base = null;
 
@@ -66,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;
 
@@ -107,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);
 
@@ -154,28 +169,13 @@ function salmon_post(App $a, $xml = '') {
 		intval($importer['uid'])
 	);
 
-	if (!DBA::isResult($r)) {
-		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);
-
-			if ($result['success']) {
-				$r = q("SELECT * FROM `contact` WHERE `network` = '%s' AND ( `url` = '%s' OR `alias` = '%s')
-					AND `uid` = %d LIMIT 1",
-					DBA::escape(Protocol::OSTATUS),
-					DBA::escape($author_link),
-					DBA::escape($author_link),
-					intval($importer['uid'])
-				);
-			}
-		}
+	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.
 
-	//if((DBA::isResult($r)) && (($r[0]['readonly']) || ($r[0]['rel'] == Contact::FOLLOWER) || ($r[0]['blocked']))) {
 	if (DBA::isResult($r) && $r[0]['blocked']) {
 		Logger::log('Ignoring this author.');
 		throw new \Friendica\Network\HTTPException\AcceptedException();