X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fsalmon.php;h=388d4854dd245d52faa73b884aec68233a76ab64;hb=da9b5f32dbca023e90239558d30577bcef5b3045;hp=2e7a5596e5192cbf7d245654660a862b27471342;hpb=3d97149007872d69ca43ec955137b887d95239cf;p=friendica.git

diff --git a/mod/salmon.php b/mod/salmon.php
index 2e7a5596e5..388d4854dd 100644
--- a/mod/salmon.php
+++ b/mod/salmon.php
@@ -24,7 +24,6 @@ use Friendica\Core\Logger;
 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;
@@ -42,7 +41,7 @@ function salmon_post(App $a, $xml = '') {
 
 	Logger::debug('new salmon ' . $xml);
 
-	$nick       = ((DI::args()->getArgc() > 1) ? Strings::escapeTags(trim(DI::args()->getArgv()[1])) : '');
+	$nick = trim(DI::args()->getArgv()[1] ?? '');
 
 	$importer = DBA::selectFirst('user', [], ['nickname' => $nick, 'account_expired' => false, 'account_removed' => false]);
 	if (! DBA::isResult($importer)) {
@@ -158,7 +157,7 @@ function salmon_post(App $a, $xml = '') {
 	*
 	*/
 
-	$contact = DBA::selectFirst('contact', ["`network` IN (?, ?) AND (`nurl` = ? OR `alias` = ? OR `alias` = ?) AND `uid` = ?",
+	$contact = DBA::selectFirst('contact', [], ["`network` IN (?, ?) AND (`nurl` = ? OR `alias` = ? OR `alias` = ?) AND `uid` = ?",
 		Protocol::OSTATUS, Protocol::DFRN, Strings::normaliseLink($author_link), $author_link, Strings::normaliseLink($author_link), $importer['uid']]);
 
 	if (!empty($contact['gsid'])) {
@@ -176,7 +175,9 @@ function salmon_post(App $a, $xml = '') {
 	// Placeholder for hub discovery.
 	$hub = '';
 
-	OStatus::import($data, $importer, $contact ?: [], $hub);
+	$contact = $contact ?: [];
+
+	OStatus::import($data, $importer, $contact, $hub);
 
 	throw new \Friendica\Network\HTTPException\OKException();
 }