Merge pull request #11647 from Quix0r/fixes/type-error-exception

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

diff --git a/src/Module/OpenSearch.php b/src/Module/OpenSearch.php
index dbf04040b89b5c83561cf38dc6619b194b28841d..35d6890ec604694d51ebc778830861c89ea2885c 100644 (file)
--- a/src/Module/OpenSearch.php
+++ b/src/Module/OpenSearch.php
@@ -1,10 +1,30 @@
 <?php
+/**
+ * @copyright Copyright (C) 2010-2022, 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 DOMDocument;
 use DOMElement;
 use Friendica\BaseModule;
+use Friendica\Core\System;
 use Friendica\DI;
 use Friendica\Util\XML;
 
@@ -17,12 +37,10 @@ class OpenSearch extends BaseModule
        /**
         * @throws \Exception
         */
-       public static function rawContent(array $parameters = [])
+       protected function rawContent(array $request = [])
        {
-               header('Content-type: application/opensearchdescription+xml');
-
-               $hostname = DI::baseUrl()->getHostname()();
-               $baseUrl  = DI::app()->getBaseURL();
+               $hostname = DI::baseUrl()->getHostname();
+               $baseUrl  = DI::baseUrl()->get();
 
                /** @var DOMDocument $xml */
                $xml = null;
@@ -66,8 +84,6 @@ class OpenSearch extends BaseModule
                        'template' => "$baseUrl/opensearch",
                ]);
 
-               echo $xml->saveXML();
-
-               exit();
+               System::httpExit($xml->saveXML(), Response::TYPE_XML, 'application/opensearchdescription+xml');
        }
 }