Merge pull request #8141 from annando/brief2

[friendica.git] / mod / salmon.php

diff --git a/mod/salmon.php b/mod/salmon.php
index 67e467a73fea89ceb7c9aa1dd03c50997f386129..c7b25a665573ec94b33519c30a328baa10400ea6 100644 (file)
--- a/mod/salmon.php
+++ b/mod/salmon.php
@@ -2,18 +2,19 @@
 /**
  * @file mod/salmon.php
  */
+
 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 +37,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 +158,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']) {