Merge pull request #4386 from MrPetovan/task/3878-move-friendica_smarty-to-src

Move SMARTY3_TEMPLATE_FOLDER to FriendicaSmarty

diff --git a/include/text.php b/include/text.php
index 73792e53ce5874785317fb27d783c494b406dda3..dc604124fd4bb8fbab371d7035447809ab026a03 100644 (file)
--- a/include/text.php
+++ b/include/text.php
@@ -615,36 +615,6 @@ function get_markup_template($s, $root = '') {
        return $template;
 }
 
-
-/**
- *
- * @param App $a
- * @param string $filename
- * @param string $root
- * @return string
- */
-function get_template_file($a, $filename, $root = '') {
-       $theme = current_theme();
-
-       // Make sure $root ends with a slash /
-       if ($root !== '' && substr($root, -1, 1) !== '/') {
-               $root = $root . '/';
-       }
-
-       if (file_exists("{$root}view/theme/$theme/$filename")) {
-               $template_file = "{$root}view/theme/$theme/$filename";
-       } elseif (x($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";
-       }
-
-       return $template_file;
-}
-
-
 /**
  *  for html,xml parsing - let's say you've got
  *  an attribute foobar="class1 class2 class3"

diff --git a/src/Render/FriendicaSmarty.php b/src/Render/FriendicaSmarty.php
index b147d7e81b6b4a8a787da6ce3e3c7f4a798fe93e..278fe1f9388cfdcde84a8440c18aa01d89e2d66b 100644 (file)
--- a/src/Render/FriendicaSmarty.php
+++ b/src/Render/FriendicaSmarty.php
@@ -6,15 +6,15 @@ namespace Friendica\Render;
 \r
 use Smarty;\r
 \r
-define('SMARTY3_TEMPLATE_FOLDER', 'templates');\r
-\r
 /**\r
- * Description of FriendicaSmarty\r
+ * Friendica extension of the Smarty3 template engine\r
  *\r
- * @author benlo\r
+ * @author Hypolite Petovan <mrpetovan@gmail.com>\r
  */\r
 class FriendicaSmarty extends Smarty\r
 {\r
+       const SMARTY3_TEMPLATE_FOLDER = 'templates';\r
+\r
        public $filename;\r
 \r
        function __construct()\r
@@ -26,12 +26,12 @@ class FriendicaSmarty extends Smarty
 \r
                // setTemplateDir can be set to an array, which Smarty will parse in order.\r
                // The order is thus very important here\r
-               $template_dirs = ['theme' => "view/theme/$theme/" . SMARTY3_TEMPLATE_FOLDER . "/"];\r
+               $template_dirs = ['theme' => "view/theme/$theme/" . self::SMARTY3_TEMPLATE_FOLDER . "/"];\r
                if (x($a->theme_info, "extends")) {\r
-                       $template_dirs = $template_dirs + ['extends' => "view/theme/" . $a->theme_info["extends"] . "/" . SMARTY3_TEMPLATE_FOLDER . "/"];\r
+                       $template_dirs = $template_dirs + ['extends' => "view/theme/" . $a->theme_info["extends"] . "/" . self::SMARTY3_TEMPLATE_FOLDER . "/"];\r
                }\r
 \r
-               $template_dirs = $template_dirs + ['base' => "view/" . SMARTY3_TEMPLATE_FOLDER . "/"];\r
+               $template_dirs = $template_dirs + ['base' => "view/" . self::SMARTY3_TEMPLATE_FOLDER . "/"];\r
                $this->setTemplateDir($template_dirs);\r
 \r
                $this->setCompileDir('view/smarty3/compiled/');\r

diff --git a/src/Render/FriendicaSmartyEngine.php b/src/Render/FriendicaSmartyEngine.php
index 6fd51cf5d1a9e307920e980dc3b9cc11c1b11d19..949ac58c82d1f4b1a82c9babeac4acc1a7ea512e 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 <mrpetovan@gmail.com>
+ */
 class FriendicaSmartyEngine implements ITemplateEngine
 {
        static $name = "smarty3";
@@ -52,8 +55,26 @@ class FriendicaSmartyEngine implements ITemplateEngine
        public function getTemplateFile($file, $root = '')
        {
                $a = get_app();
-               $template_file = get_template_file($a, SMARTY3_TEMPLATE_FOLDER . '/' . $file, $root);
                $template = new FriendicaSmarty();
+
+               // Make sure $root ends with a slash /
+               if ($root !== '' && substr($root, -1, 1) !== '/') {
+                       $root = $root . '/';
+               }
+
+               $theme = current_theme();
+               $filename = $template::SMARTY3_TEMPLATE_FOLDER . '/' . $file;
+
+               if (file_exists("{$root}view/theme/$theme/$filename")) {
+                       $template_file = "{$root}view/theme/$theme/$filename";
+               } elseif (x($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;