X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fsalmon.php;h=388d4854dd245d52faa73b884aec68233a76ab64;hb=f245fdaa5dbc0898c89a3f2656e8f5c2def89c29;hp=de8d97133452d8bac9303fc067dbd07057aba82c;hpb=9617167fe6c4ab4e3b4a1db8313aff31047e2a77;p=friendica.git diff --git a/mod/salmon.php b/mod/salmon.php index de8d971334..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'])) {