Template Engine with Subdirectory

- Use explicit root path for template engine
- Replace "__DIR__" calls in addons with subdirectories
- Fixes local tests, where call is made out of '/' and not '/vagrant/'

diff --git a/cookienotice/cookienotice.php b/cookienotice/cookienotice.php
index bf4e1c0eac85edc71d00616f246cd9b748e8ff5c..a5df0d2d6110179ea730050966bbbb105954fe87 100644 (file)
--- a/cookienotice/cookienotice.php
+++ b/cookienotice/cookienotice.php
@@ -42,7 +42,7 @@ function cookienotice_addon_admin(App $a, &$s)
        $text = DI::config()->get('cookienotice', 'text', DI::l10n()->t('This website uses cookies. If you continue browsing this website, you agree to the usage of cookies.'));
        $oktext = DI::config()->get('cookienotice', 'oktext', DI::l10n()->t('OK'));
 
-       $t = Renderer::getMarkupTemplate('admin.tpl', __DIR__);
+       $t = Renderer::getMarkupTemplate('admin.tpl', 'addon/cookienotice/');
        $s .= Renderer::replaceMacros($t, [
                '$description' => DI::l10n()->t('<b>Configure your cookie usage notice.</b> It should just be a notice, saying that the website uses cookies. It is shown as long as a user didnt confirm clicking the OK button.'),
                '$text' => ['cookienotice-text', DI::l10n()->t('Cookie Usage Notice'), $text],
@@ -108,7 +108,7 @@ function cookienotice_page_end(App $a, &$b)
        $text = (string)DI::config()->get('cookienotice', 'text', DI::l10n()->t('This website uses cookies to recognize revisiting and logged in users. You accept the usage of these cookies by continue browsing this website.'));
        $oktext = (string)DI::config()->get('cookienotice', 'oktext', DI::l10n()->t('OK'));
 
-       $page_end_tpl = Renderer::getMarkupTemplate('cookienotice.tpl', __DIR__);
+       $page_end_tpl = Renderer::getMarkupTemplate('cookienotice.tpl', 'addon/cookienotice/');
 
        $page_end = Renderer::replaceMacros($page_end_tpl, [
                '$text' => $text,

diff --git a/geonames/geonames.php b/geonames/geonames.php
index 38888ecbaf933b147a741da65e2d916d51cfd5cc..e6962d764efff4b52896fed5e4c6c7e8dfb701b0 100644 (file)
--- a/geonames/geonames.php
+++ b/geonames/geonames.php
@@ -139,7 +139,7 @@ function geonames_addon_settings(App $a, &$s)
        /* Get the current state of our config variable */
        $enabled = intval(DI::pConfig()->get(local_user(), 'geonames', 'enable'));
 
-       $t = Renderer::getMarkupTemplate('settings.tpl', __DIR__);
+       $t = Renderer::getMarkupTemplate('settings.tpl', 'addon/geonames/');
        $s .= Renderer::replaceMacros($t, [
                '$title' => DI::l10n()->t('Geonames Settings'),
                '$description' => DI::l10n()->t('Replace numerical coordinates by the nearest populated location name in your posts.'),

diff --git a/mathjax/mathjax.php b/mathjax/mathjax.php
index 6f2c2844a4b6d0e3aa5a17c94ea42c74b0899a56..3cc42c47f5da64cc33065395ca682307249a2767 100644 (file)
--- a/mathjax/mathjax.php
+++ b/mathjax/mathjax.php
@@ -49,7 +49,7 @@ function mathjax_settings(App $a, &$s)
 
        $use = DI::pConfig()->get(local_user(), 'mathjax', 'use', false);
 
-       $tpl = Renderer::getMarkupTemplate('settings.tpl', __DIR__);
+       $tpl = Renderer::getMarkupTemplate('settings.tpl', 'addon/mathjax');
        $s .= Renderer::replaceMacros($tpl, [
                '$title'        => 'MathJax',
                '$description'  => DI::l10n()->t('The MathJax addon renders mathematical formulae written using the LaTeX syntax surrounded by the usual $$ or an eqnarray block in the postings of your wall,network tab and private mail.'),

diff --git a/pageheader/pageheader.php b/pageheader/pageheader.php
index f6e71aa32cc6134db8e56cd769c91afc25fb0ee0..201df32214caec25de9a04d4a76f648dc048231c 100644 (file)
--- a/pageheader/pageheader.php
+++ b/pageheader/pageheader.php
@@ -31,7 +31,7 @@ function pageheader_addon_admin(App &$a, &$s)
        if(! $words)
                $words = '';
 
-       $t = Renderer::getMarkupTemplate('admin.tpl', __DIR__);
+       $t = Renderer::getMarkupTemplate('admin.tpl', 'addon/pageheader');
        $s .= Renderer::replaceMacros($t, [
                '$title' => DI::l10n()->t('"pageheader" Settings'),
                '$phwords' => ['pageheader-words', DI::l10n()->t('Message'), $words, DI::l10n()->t('Message to display on every page on this server (or put a pageheader.html file in your docroot)')],