PWA manifest and new @ini_theme_color replacement

conf/manifest.json

@@ -0,0 +1,3 @@
+{
+    "display": "standalone"
+}

inc/Manifest.php

@@ -0,0 +1,95 @@
+<?php
+
+namespace dokuwiki;
+
+class Manifest
+{
+    public function sendManifest()
+    {
+        $manifest = retrieveConfig('manifest', 'jsonToArray');
+
+        global $conf;
+
+        $manifest['scope'] = DOKU_REL;
+
+        if (empty($manifest['name'])) {
+            $manifest['name'] = $conf['title'];
+        }
+
+        if (empty($manifest['short_name'])) {
+            $manifest['short_name'] = $conf['title'];
+        }
+
+        if (empty($manifest['description'])) {
+            $manifest['description'] = $conf['tagline'];
+        }
+
+        if (empty($manifest['start_url'])) {
+            $manifest['start_url'] = DOKU_REL;
+        }
+
+        $styleUtil = new \dokuwiki\StyleUtils();
+        $styleIni = $styleUtil->cssStyleini($conf['template']);
+        $replacements = $styleIni['replacements'];
+
+        if (empty($manifest['background_color'])) {
+            $manifest['background_color'] = $replacements['__background__'];
+        }
+
+        if (empty($manifest['theme_color'])) {
+            $manifest['theme_color'] = !empty($replacements['__theme_color__']) ? $replacements['__theme_color__'] : $replacements['__background_alt__'];
+        }
+
+        if (empty($manifest['icons'])) {
+            $manifest['icons'] = [];
+            $look = [
+                ':wiki:logo.png',
+                ':logo.png',
+                'images/logo.png',
+                ':wiki:apple-touch-icon.png',
+                ':apple-touch-icon.png',
+                'images/apple-touch-icon.png',
+                ':wiki:favicon.svg',
+                ':favicon.svg',
+                'images/favicon.svg',
+                ':wiki:favicon.ico',
+                ':favicon.ico',
+                'images/favicon.ico',
+                ':wiki:logo',
+            ];
+
+            $abs = true;
+            foreach ($look as $img) {
+                if ($img[0] === ':') {
+                    $file = mediaFN($img);
+                    $ismedia = true;
+                } else {
+                    $file = tpl_incdir() . $img;
+                    $ismedia = false;
+                }
+
+                if (file_exists($file)) {
+                    $imginfo = getimagesize($file);
+                    if ($ismedia) {
+                        $url = ml($img, '', true, '', $abs);
+                    } else {
+                        $url = tpl_basedir() . $img;
+                        if ($abs) {
+                            $url = DOKU_URL . substr($url, strlen(DOKU_REL));
+                        }
+                    }
+                    $manifest['icons'][] = [
+                        'src' => $url,
+                        'sizes' => $imginfo[0] . 'x' . $imginfo[1],
+                        'type' => $imginfo['mime'],
+                    ];
+                };
+            }
+        }
+
+        trigger_event('MANIFEST_SEND', $manifest);
+
+        header('Content-Type: application/manifest+json');
+        echo json_encode($manifest);
+    }
+}

inc/StyleUtils.php

@@ -0,0 +1,107 @@
+<?php
+
+namespace dokuwiki;
+
+class StyleUtils
+{
+    /**
+     * Load style ini contents
+     *
+     * Loads and merges style.ini files from template and config and prepares
+     * the stylesheet modes
+     *
+     * @author Andreas Gohr <andi@splitbrain.org>
+     *
+     * @param string $tpl the used template
+     * @param bool   $preview load preview replacements
+     * @return array with keys 'stylesheets' and 'replacements'
+     */
+    public function cssStyleini($tpl, $preview=false) {
+        global $conf;
+
+        $stylesheets = array(); // mode, file => base
+        // guaranteed placeholder => value
+        $replacements = array(
+            '__text__' => "#000",
+            '__background__' => "#fff",
+            '__text_alt__' => "#999",
+            '__background_alt__' => "#eee",
+            '__text_neu__' => "#666",
+            '__background_neu__' => "#ddd",
+            '__border__' => "#ccc",
+            '__highlight__' => "#ff9",
+            '__link__' => "#00f",
+        );
+
+        // load template's style.ini
+        $incbase = tpl_incdir($tpl);
+        $webbase = tpl_basedir($tpl);
+        $ini = $incbase.'style.ini';
+        if(file_exists($ini)){
+            $data = parse_ini_file($ini, true);
+
+            // stylesheets
+            if(is_array($data['stylesheets'])) foreach($data['stylesheets'] as $file => $mode){
+                $stylesheets[$mode][$incbase.$file] = $webbase;
+            }
+
+            // replacements
+            if(is_array($data['replacements'])){
+                $replacements = array_merge($replacements, $this->cssFixreplacementurls($data['replacements'],$webbase));
+            }
+        }
+
+        // load configs's style.ini
+        $webbase = DOKU_BASE;
+        $ini = DOKU_CONF."tpl/$tpl/style.ini";
+        $incbase = dirname($ini).'/';
+        if(file_exists($ini)){
+            $data = parse_ini_file($ini, true);
+
+            // stylesheets
+            if(isset($data['stylesheets']) && is_array($data['stylesheets'])) foreach($data['stylesheets'] as $file => $mode){
+                $stylesheets[$mode][$incbase.$file] = $webbase;
+            }
+
+            // replacements
+            if(isset($data['replacements']) && is_array($data['replacements'])){
+                $replacements = array_merge($replacements, $this->cssFixreplacementurls($data['replacements'],$webbase));
+            }
+        }
+
+        // allow replacement overwrites in preview mode
+        if($preview) {
+            $webbase = DOKU_BASE;
+            $ini     = $conf['cachedir'].'/preview.ini';
+            if(file_exists($ini)) {
+                $data = parse_ini_file($ini, true);
+                // replacements
+                if(is_array($data['replacements'])) {
+                    $replacements = array_merge($replacements, $this->cssFixreplacementurls($data['replacements'], $webbase));
+                }
+            }
+        }
+
+        return array(
+            'stylesheets' => $stylesheets,
+            'replacements' => $replacements
+        );
+    }
+
+
+    /**
+     * Amend paths used in replacement relative urls, refer FS#2879
+     *
+     * @author Chris Smith <chris@jalakai.co.uk>
+     *
+     * @param array $replacements with key-value pairs
+     * @param string $location
+     * @return array
+     */
+    protected function cssFixreplacementurls($replacements, $location) {
+        foreach($replacements as $key => $value) {
+            $replacements[$key] = preg_replace('#(url\([ \'"]*)(?!/|data:|http://|https://| |\'|")#','\\1'.$location,$value);
+        }
+        return $replacements;
+    }
+}

inc/config_cascade.php

@@ -28,6 +28,10 @@
             'default'   => array(DOKU_CONF . 'license.php'),
             'local'     => array(DOKU_CONF . 'license.local.php'),
         ),
+        'manifest' => array(
+            'default'   => array(DOKU_CONF . 'manifest.json'),
+            'local'     => array(DOKU_CONF . 'manifest.local.json'),
+        ),
         'mediameta' => array(
             'default'   => array(DOKU_CONF . 'mediameta.php'),
             'local'     => array(DOKU_CONF . 'mediameta.local.php'),

inc/confutils.php

@@ -255,6 +255,63 @@ function confToHash($file,$lower=false) {
     return linesToHash($lines, $lower);
 }
 
+/**
+ * Read a json config file into an array
+ *
+ * @param string $file
+ * @return array
+ */
+function jsonToArray($file)
+{
+    $json = file_get_contents($file);
+
+    $conf = json_decode($json, true);
+
+    $jsonError = json_last_error();
+    if (!is_array($conf) && $jsonError !== JSON_ERROR_NONE) {
+
+        switch ($jsonError) {
+            case JSON_ERROR_DEPTH:
+                $jsonErrorText = 'The maximum stack depth has been exceeded';
+                break;
+            case JSON_ERROR_STATE_MISMATCH:
+                $jsonErrorText = 'Invalid or malformed JSON';
+                break;
+            case JSON_ERROR_CTRL_CHAR:
+                $jsonErrorText = 'Control character error, possibly incorrectly encoded';
+                break;
+            case JSON_ERROR_SYNTAX:
+                $jsonErrorText = 'Syntax error';
+                break;
+            case JSON_ERROR_UTF8:
+                $jsonErrorText = 'Malformed UTF-8 characters, possibly incorrectly encoded';
+                break;
+            case JSON_ERROR_RECURSION:
+                $jsonErrorText = 'One or more recursive references in the value to be encoded';
+                break;
+            case JSON_ERROR_INF_OR_NAN:
+                $jsonErrorText = 'One or more NAN or INF values in the value to be encoded';
+                break;
+            case JSON_ERROR_UNSUPPORTED_TYPE:
+                $jsonErrorText = 'A value of a type that cannot be encoded was given';
+                break;
+            case JSON_ERROR_INVALID_PROPERTY_NAME:
+                $jsonErrorText = 'A property name that cannot be encoded was given';
+                break;
+            case JSON_ERROR_UTF16:
+                $jsonErrorText = 'Malformed UTF-16 characters, possibly incorrectly encoded';
+                break;
+            default:
+                $jsonErrorText = 'Unknown Error Code';
+        }
+
+        trigger_error('JSON decoding error "' . $jsonErrorText . '" for file ' . $file, E_USER_WARNING);
+        return [];
+    }
+
+    return $conf;
+}
+
 /**
  * Retrieve the requested configuration information
  *

inc/load.php

@@ -82,6 +82,7 @@ function load_autoload($name){
         'RemoteAPI'             => DOKU_INC.'inc/remote.php',
         'RemoteAPICore'         => DOKU_INC.'inc/RemoteAPICore.php',
         'Subscription'          => DOKU_INC.'inc/subscription.php',
+        'StyleUtil'             => DOKU_INC.'inc/StyleUtil.php',
 
         'DokuWiki_Action_Plugin' => DOKU_PLUGIN.'action.php',
         'DokuWiki_Admin_Plugin'  => DOKU_PLUGIN.'admin.php',

inc/template.php

@@ -242,6 +242,10 @@ function tpl_metaheaders($alt = true) {
         );
     }
 
+    if (actionOK('manifest')) {
+        $head['link'][] = array('rel'=> 'manifest', 'href'=> DOKU_BASE.'lib/exe/manifest.php');
+    }
+
     if($alt) {
         if(actionOK('rss')) {
             $head['link'][] = array(