Merge pull request #1 from friendica/develop

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

diff --git a/src/Module/Debug/Feed.php b/src/Module/Debug/Feed.php
index a11df59b79f32ecfd07bdce37911a567845b1f1c..4107422094a970c8f9de1e0ffa61f54b88e992a6 100644 (file)
--- a/src/Module/Debug/Feed.php
+++ b/src/Module/Debug/Feed.php
@@ -1,42 +1,56 @@
 <?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/>.
+ *
+ */
 
 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;
 
 /**
  * Tests a given feed of a contact
  */
 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();
+                       notice(DI::l10n()->t('You must be logged in to use this module'));
+                       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);
+                       $contact = Model\Contact::getByURLForUser($url, local_user(), false);
 
-                       $xml = Network::fetchUrl($contact['poll']);
+                       $xml = DI::httpRequest()->fetch($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 +60,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', DI::l10n()->t('Source URL'), $_REQUEST['url'] ?? '', ''],
                        '$result' => $result
                ]);
        }