Merge pull request #8753 from MrPetovan/bug/fatal-errors

[friendica.git] / mod / salmon.php

diff --git a/mod/salmon.php b/mod/salmon.php
index 313c2cb0bb4a830a759df057c390187c2f6f2de2..1932d3ba4175599f990121a0608382562e44b90f 100644 (file)
--- a/mod/salmon.php
+++ b/mod/salmon.php
@@ -1,13 +1,29 @@
 <?php
 /**
- * @file mod/salmon.php
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @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\Database\DBA;
+use Friendica\DI;
 use Friendica\Model\Contact;
 use Friendica\Protocol\ActivityNamespace;
 use Friendica\Protocol\OStatus;
@@ -26,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);
@@ -158,8 +170,8 @@ function salmon_post(App $a, $xml = '') {
        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 (DI::pConfig()->get($importer['uid'], 'system', 'ostatus_autofriend')) {
+                       $result = Contact::createFromProbe($importer, $author_link);
 
                        if ($result['success']) {
                                $r = q("SELECT * FROM `contact` WHERE `network` = '%s' AND ( `url` = '%s' OR `alias` = '%s')