Rework Feed::import parameters

[friendica.git] / src / Module / Debug / Feed.php

diff --git a/src/Module/Debug/Feed.php b/src/Module/Debug/Feed.php
index a11df59b79f32ecfd07bdce37911a567845b1f1c..f3e8af0c5736c49d1d8ff97304adb2686ca88c34 100644 (file)
--- a/src/Module/Debug/Feed.php
+++ b/src/Module/Debug/Feed.php
@@ -5,6 +5,7 @@ namespace Friendica\Module\Debug;
 use Friendica\BaseModule;
 use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
+use Friendica\DI;
 use Friendica\Model;
 use Friendica\Protocol;
 use Friendica\Util\Network;
@@ -14,29 +15,26 @@ use Friendica\Util\Network;
  */
 class Feed extends BaseModule
 {
-       public static function init()
+       public static function init(array $parameters = [])
        {
                if (!local_user()) {
                        info(L10n::t('You must be logged in to use this module'));
-                       self::getApp()->internalRedirect();
+                       DI::baseUrl()->redirect();
                }
        }
 
-       public static function content()
+       public static function content(array $parameters = [])
        {
                $result = [];
                if (!empty($_REQUEST['url'])) {
                        $url = $_REQUEST['url'];
 
-                       $importer = Model\User::getById(local_user());
-
                        $contact_id = Model\Contact::getIdForURL($url, local_user(), true);
                        $contact = Model\Contact::getById($contact_id);
 
                        $xml = Network::fetchUrl($contact['poll']);
 
-                       $dummy = null;
-                       $import_result = Protocol\Feed::import($xml, $importer, $contact, $dummy, true);
+                       $import_result = Protocol\Feed::import($xml);
 
                        $result = [
                                'input' => $xml,
@@ -46,7 +44,7 @@ class Feed extends BaseModule
 
                $tpl = Renderer::getMarkupTemplate('feedtest.tpl');
                return Renderer::replaceMacros($tpl, [
-                       '$url'    => ['url', L10n::t('Source URL'), defaults($_REQUEST, 'url', ''), ''],
+                       '$url'    => ['url', L10n::t('Source URL'), $_REQUEST['url'] ?? '', ''],
                        '$result' => $result
                ]);
        }