Remove deprecated code

[friendica.git] / src / Protocol / DFRN.php

diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php
index c9d2f1e4cb9ebb471caf8a720edc34b3cfe9db90..424b519063da5385fb0ac06ab6314cbab5ddd134 100644 (file)
--- a/src/Protocol/DFRN.php
+++ b/src/Protocol/DFRN.php
@@ -14,7 +14,6 @@ use Friendica\App\BaseURL;
 use Friendica\Content\OEmbed;
 use Friendica\Content\Text\BBCode;
 use Friendica\Content\Text\HTML;
-use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
@@ -489,11 +488,11 @@ class DFRN
        {
 
                /* get site pubkey. this could be a new installation with no site keys*/
-               $pubkey = Config::get('system', 'site_pubkey');
+               $pubkey = DI::config()->get('system', 'site_pubkey');
                if (! $pubkey) {
                        $res = Crypto::newKeypair(1024);
-                       Config::set('system', 'site_prvkey', $res['prvkey']);
-                       Config::set('system', 'site_pubkey', $res['pubkey']);
+                       DI::config()->set('system', 'site_prvkey', $res['prvkey']);
+                       DI::config()->set('system', 'site_pubkey', $res['pubkey']);
                }
 
                $rp = q(
@@ -527,7 +526,7 @@ class DFRN
                XML::addElement($doc, $relocate, "dfrn:confirm", $owner['confirm']);
                XML::addElement($doc, $relocate, "dfrn:notify", $owner['notify']);
                XML::addElement($doc, $relocate, "dfrn:poll", $owner['poll']);
-               XML::addElement($doc, $relocate, "dfrn:sitepubkey", Config::get('system', 'site_pubkey'));
+               XML::addElement($doc, $relocate, "dfrn:sitepubkey", DI::config()->get('system', 'site_pubkey'));
 
                $root->appendChild($relocate);
 
@@ -688,7 +687,7 @@ class DFRN
                                `profile`.`pub_keywords`, `profile`.`xmpp`, `profile`.`dob`
                        FROM `profile`
                                INNER JOIN `user` ON `user`.`uid` = `profile`.`uid`
-                               WHERE `profile`.`is-default` AND NOT `user`.`hidewall` AND `user`.`uid` = %d",
+                               WHERE NOT `user`.`hidewall` AND `user`.`uid` = %d",
                        intval($owner['uid'])
                );
                if (DBA::isResult($r)) {
@@ -1192,12 +1191,12 @@ class DFRN
                        $idtosend = '1:' . $orig_id;
                }
 
-               $rino = Config::get('system', 'rino_encrypt');
+               $rino = DI::config()->get('system', 'rino_encrypt');
                $rino = intval($rino);
 
                Logger::log("Local rino version: ". $rino, Logger::DEBUG);
 
-               $ssl_val = intval(Config::get('system', 'ssl_policy'));
+               $ssl_val = intval(DI::config()->get('system', 'ssl_policy'));
 
                switch ($ssl_val) {
                        case BaseURL::SSL_POLICY_FULL: