Merge pull request #8632 from annando/fix-fatal

[friendica.git] / mod / salmon.php

diff --git a/mod/salmon.php b/mod/salmon.php
index 67e467a73fea89ceb7c9aa1dd03c50997f386129..6eea57f6a7e3a3d70066e83ea49aabf240e311f9 100644 (file)
--- a/mod/salmon.php
+++ b/mod/salmon.php
@@ -1,19 +1,36 @@
 <?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\Core\System;
 use Friendica\Database\DBA;
+use Friendica\DI;
 use Friendica\Model\Contact;
+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 = '') {
 
@@ -36,7 +53,7 @@ function salmon_post(App $a, $xml = '') {
 
        // 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;
 
@@ -157,7 +174,7 @@ 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')) {
+               if (DI::pConfig()->get($importer['uid'], 'system', 'ostatus_autofriend')) {
                        $result = Contact::createFromProbe($importer['uid'], $author_link);
 
                        if ($result['success']) {