Remove/replace killme() with *exit()

[friendica.git] / src / Render / FriendicaSmartyEngine.php

diff --git a/src/Render/FriendicaSmartyEngine.php b/src/Render/FriendicaSmartyEngine.php
index 6fd51cf5d1a9e307920e980dc3b9cc11c1b11d19..54295684cc70c4ddc95779798d8d75f47d9a543f 100644 (file)
--- a/src/Render/FriendicaSmartyEngine.php
+++ b/src/Render/FriendicaSmartyEngine.php
@@ -6,8 +6,11 @@ namespace Friendica\Render;
 
 use Friendica\Core\Addon;
 
-define('SMARTY3_TEMPLATE_FOLDER', 'templates');
-
+/**
+ * Smarty implementation of the Friendica template engine interface
+ *
+ * @author Hypolite Petovan <hypolite@mrpetovan.com>
+ */
 class FriendicaSmartyEngine implements ITemplateEngine
 {
        static $name = "smarty3";
@@ -16,7 +19,7 @@ class FriendicaSmartyEngine implements ITemplateEngine
        {
                if (!is_writable('view/smarty3/')) {
                        echo "<b>ERROR:</b> folder <tt>view/smarty3/</tt> must be writable by webserver.";
-                       killme();
+                       exit();
                }
        }
 
@@ -29,7 +32,7 @@ class FriendicaSmartyEngine implements ITemplateEngine
                        $s = new FriendicaSmarty();
                }
 
-               $r['$APP'] = get_app();
+               $r['$APP'] = \get_app();
 
                // "middleware": inject variables into templates
                $arr = [
@@ -51,9 +54,27 @@ class FriendicaSmartyEngine implements ITemplateEngine
 
        public function getTemplateFile($file, $root = '')
        {
-               $a = get_app();
-               $template_file = get_template_file($a, SMARTY3_TEMPLATE_FOLDER . '/' . $file, $root);
+               $a = \get_app();
                $template = new FriendicaSmarty();
+
+               // Make sure $root ends with a slash /
+               if ($root !== '' && substr($root, -1, 1) !== '/') {
+                       $root = $root . '/';
+               }
+
+               $theme = $a->getCurrentTheme();
+               $filename = $template::SMARTY3_TEMPLATE_FOLDER . '/' . $file;
+
+               if (file_exists("{$root}view/theme/$theme/$filename")) {
+                       $template_file = "{$root}view/theme/$theme/$filename";
+               } elseif (!empty($a->theme_info['extends']) && file_exists(sprintf('%sview/theme/%s}/%s', $root, $a->theme_info['extends'], $filename))) {
+                       $template_file = sprintf('%sview/theme/%s}/%s', $root, $a->theme_info['extends'], $filename);
+               } elseif (file_exists("{$root}/$filename")) {
+                       $template_file = "{$root}/$filename";
+               } else {
+                       $template_file = "{$root}view/$filename";
+               }
+
                $template->filename = $template_file;
 
                return $template;