Merge branch '2023.03-rc' into stable

[friendica.git] / src / Module / ReallySimpleDiscovery.php

diff --git a/src/Module/ReallySimpleDiscovery.php b/src/Module/ReallySimpleDiscovery.php
index 382fe12d4f9d3c823482267825935645df0e5cc8..6d608063e73072284e4a5eaf52a4c9e840b2d014 100644 (file)
--- a/src/Module/ReallySimpleDiscovery.php
+++ b/src/Module/ReallySimpleDiscovery.php
@@ -1,8 +1,28 @@
 <?php
+/**
+ * @copyright Copyright (C) 2010-2023, the Friendica project
+ *
+ * @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;
 
 use Friendica\BaseModule;
+use Friendica\Core\System;
 use Friendica\DI;
 use Friendica\Util\XML;
 
@@ -12,12 +32,9 @@ use Friendica\Util\XML;
  */
 class ReallySimpleDiscovery extends BaseModule
 {
-       public static function rawContent(array $parameters = [])
+       protected function rawContent(array $request = [])
        {
-               header('Content-Type: text/xml');
-
-               $xml = null;
-               echo XML::fromArray([
+               $content = XML::fromArray([
                        'rsd' => [
                                '@attributes' => [
                                        'version' => '1.0',
@@ -31,7 +48,7 @@ class ReallySimpleDiscovery extends BaseModule
                                                        '@attributes' => [
                                                                'name'      => 'Twitter',
                                                                'preferred' => 'true',
-                                                               'apiLink'   => DI::baseUrl()->get(),
+                                                               'apiLink'   => DI::baseUrl(),
                                                                'blogID'    => '',
                                                        ],
                                                        'settings'    => [
@@ -49,7 +66,7 @@ class ReallySimpleDiscovery extends BaseModule
                                        ],
                                ],
                        ],
-               ], $xml);
-               exit();
+               ]);
+               System::httpExit($content, Response::TYPE_XML);
        }
 }