Move manifest JSON from template to array

diff --git a/src/Module/Manifest.php b/src/Module/Manifest.php
index d40624cf80f43e333cb9bffa045d054a8cb1723e..bfe758fa9782a5a22cae9cede356603d6a072306 100644 (file)
--- a/src/Module/Manifest.php
+++ b/src/Module/Manifest.php
@@ -31,23 +31,33 @@ class Manifest extends BaseModule
        {
                $config = DI::config();
 
-               header('Content-type: application/manifest+json');
-
                $touch_icon = $config->get('system', 'touch_icon') ?: 'images/friendica-128.png';
 
                $theme = DI::config()->get('system', 'theme');
 
-               $tpl = Core\Renderer::getMarkupTemplate('manifest.tpl');
-               $output = Core\Renderer::replaceMacros($tpl, [
-                       '$touch_icon'       => $touch_icon,
-                       '$title'            => $config->get('config', 'sitename', 'Friendica'),
-                       '$description'      => $config->get('config', 'info', DI::l10n()->t('A Decentralized Social Network')),
-                       '$background_color' => Core\Theme::getBackgroundColor($theme),
-                       '$theme_color'      => Core\Theme::getThemeColor($theme),
-               ]);
-
-               echo $output;
-
-               exit();
+               $manifest = [
+                       'name'        => $config->get('config', 'sitename', 'Friendica'),
+                       'start_url'   => DI::baseUrl()->get(),
+                       'display'     => 'standalone',
+                       'description' => $config->get('config', 'info', DI::l10n()->t('A Decentralized Social Network')),
+                       'short_name'  => 'Friendica',
+                       'icons'       => [
+                               [
+                                       'src'   => DI::baseUrl()->get() . '/' . $touch_icon,
+                                       'sizes' => '128x128',
+                                       'type'  => 'image/png',
+                               ],
+                       ],
+               ];
+
+               if ($background_color = Core\Theme::getBackgroundColor($theme)) {
+                       $manifest['background_color'] = $background_color;
+               }
+
+               if ($theme_color = Core\Theme::getThemeColor($theme)) {
+                       $manifest['theme_color'] = $theme_color;
+               }
+
+               Core\System::jsonExit($manifest, 'application/manifest+json');
        }
 }

diff --git a/view/templates/manifest.tpl b/view/templates/manifest.tpl
deleted file mode 100644 (file)
index f38c67d..0000000
--- a/view/templates/manifest.tpl
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "name": "{{$title}}",
-  "start_url": "{{$baseurl}}",
-  "display": "standalone",
-  "description": "{{$description}}",
-{{if $background_color}}
-  "theme_color": "{{$theme_color}}",
-{{/if}}
-{{if $background_color}}
-  "background_color": "{{$background_color}}",
-{{/if}}
-  "short_name": "Friendica",
-  "icons": [{
-    "src": "{{$baseurl}}/{{$touch_icon}}",
-    "sizes": "128x128",
-    "type": "image/png"
-  }]
-}
\ No newline at end of file