Move Notify::TYPE_MAIL

[friendica.git] / mod / pubsubhubbub.php

diff --git a/mod/pubsubhubbub.php b/mod/pubsubhubbub.php
index f71984ec1826cfce2a5df6492f17bdc4b841f759..2ffaaf729efedcb5cb42cccd6b496b83a41a86c1 100644 (file)
--- a/mod/pubsubhubbub.php
+++ b/mod/pubsubhubbub.php
@@ -1,10 +1,9 @@
 <?php
 
 use Friendica\App;
-use Friendica\Core\Config;
 use Friendica\Core\Logger;
-use Friendica\Core\System;
 use Friendica\Database\DBA;
+use Friendica\DI;
 use Friendica\Model\PushSubscriber;
 use Friendica\Util\Network;
 use Friendica\Util\Strings;
@@ -16,7 +15,7 @@ function post_var($name) {
 function pubsubhubbub_init(App $a) {
        // PuSH subscription must be considered "public" so just block it
        // if public access isn't enabled.
-       if (Config::get('system', 'block_public')) {
+       if (DI::config()->get('system', 'block_public')) {
                throw new \Friendica\Network\HTTPException\ForbiddenException();
        }
 
@@ -89,7 +88,7 @@ function pubsubhubbub_init(App $a) {
 
                // sanity check that topic URLs are the same
                $hub_topic2 = str_replace('/feed/', '/dfrn_poll/', $hub_topic);
-               $self = System::baseUrl() . '/api/statuses/user_timeline/' . $owner['nickname'] . '.atom';
+               $self = DI::baseUrl() . '/api/statuses/user_timeline/' . $owner['nickname'] . '.atom';
 
                if (!Strings::compareLink($hub_topic, $contact['poll']) && !Strings::compareLink($hub_topic2, $contact['poll']) && !Strings::compareLink($hub_topic, $self)) {
                        Logger::log('Hub topic ' . $hub_topic . ' != ' . $contact['poll']);