Create XML output for RSD with XML::fromArray()

diff --git a/src/Module/ReallySimpleDiscovery.php b/src/Module/ReallySimpleDiscovery.php
index 4c14d3c8373aadf28dcd7654b19574b709185124..515285dbfcd070b1ba2417b9021d73c55c1ad35d 100644 (file)
--- a/src/Module/ReallySimpleDiscovery.php
+++ b/src/Module/ReallySimpleDiscovery.php
@@ -3,7 +3,7 @@
 namespace Friendica\Module;
 
 use Friendica\BaseModule;
-use Friendica\Core\Renderer;
+use Friendica\Util\XML;
 
 /**
  * Prints the rsd.xml
@@ -13,9 +13,43 @@ class ReallySimpleDiscovery extends BaseModule
 {
        public static function rawContent()
        {
-               header ('Content-Type: text/xml');
-               $tpl = Renderer::getMarkupTemplate('rsd.tpl');
-               echo Renderer::replaceMacros($tpl);
+               header('Content-Type: text/xml');
+
+               $app = self::getApp();
+               $xml = null;
+               echo XML::fromArray([
+                       'rsd' => [
+                               '@attributes' => [
+                                       'version' => '1.0',
+                                       'xmlns'   => 'http://archipelago.phrasewise.com/rsd',
+                               ],
+                               'service'     => [
+                                       'engineName' => 'Friendica',
+                                       'engineLink' => 'http://friendica.com',
+                                       'apis'       => [
+                                               'api' => [
+                                                       '@attributes' => [
+                                                               'name'      => 'Twitter',
+                                                               'preferred' => 'true',
+                                                               'apiLink'   => $app->getBaseURL(),
+                                                               'blogID'    => '',
+                                                       ],
+                                                       'settings'    => [
+                                                               'docs'    => [
+                                                                       'http://status.net/wiki/TwitterCompatibleAPI',
+                                                               ],
+                                                               'setting' => [
+                                                                       '@attributes' => [
+                                                                               'name' => 'OAuth',
+                                                                       ],
+                                                                       'false',
+                                                               ],
+                                                       ],
+                                               ]
+                                       ],
+                               ],
+                       ],
+               ], $xml);
                exit();
        }
 }

diff --git a/view/templates/rsd.tpl b/view/templates/rsd.tpl
deleted file mode 100644 (file)
index c194e8f..0000000
--- a/view/templates/rsd.tpl
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<rsd version="1.0" xmlns="http://archipelago.phrasewise.com/rsd">
-       <service>
-               <engineName>Friendica</engineName>
-               <engineLink>http://friendica.com/</engineLink>
-               <apis>
-                       <api name="Twitter" preferred="true" apiLink="{{$baseurl}}/api/" blogID="">
-                               <settings>
-                                       <docs>http://status.net/wiki/TwitterCompatibleAPI</docs>
-                                       <setting name="OAuth">false</setting>
-                               </settings>
-                       </api>
-               </apis>
-       </service>
-</rsd>