X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=inline;f=src%2FRender%2FFriendicaSmartyEngine.php;h=de078d233c20132223b0eea51cdde262d10b3912;hb=8addcf98442d8651c969cbcf5383c6ea71c921ad;hp=2cfce760adc2cba53c6e62950638f61097e5208c;hpb=03c1f2cbf8d2bc2f6deb53675aea16f56ab8c2e5;p=friendica.git

diff --git a/src/Render/FriendicaSmartyEngine.php b/src/Render/FriendicaSmartyEngine.php
index 2cfce760ad..de078d233c 100644
--- a/src/Render/FriendicaSmartyEngine.php
+++ b/src/Render/FriendicaSmartyEngine.php
@@ -1,59 +1,82 @@
-<?php
-/**
- * @file src/Render/FriendicaSmartyEngine.php
- */
-namespace Friendica\Render;
-
-use Friendica\Core\Addon;
-
-class FriendicaSmartyEngine implements ITemplateEngine
-{
-	static $name = "smarty3";
-
-	public function __construct()
-	{
-		if (!is_writable('view/smarty3/')) {
-			echo "<b>ERROR:</b> folder <tt>view/smarty3/</tt> must be writable by webserver.";
-			killme();
-		}
-	}
-
-	// ITemplateEngine interface
-	public function replaceMacros($s, $r)
-	{
-		$template = '';
-		if (gettype($s) === 'string') {
-			$template = $s;
-			$s = new FriendicaSmarty();
-		}
-
-		$r['$APP'] = get_app();
-
-		// "middleware": inject variables into templates
-		$arr = [
-			"template" => basename($s->filename),
-			"vars" => $r
-		];
-		Addon::callHooks("template_vars", $arr);
-		$r = $arr['vars'];
-
-		foreach ($r as $key => $value) {
-			if ($key[0] === '$') {
-				$key = substr($key, 1);
-			}
-
-			$s->assign($key, $value);
-		}
-		return $s->parsed($template);
-	}
-
-	public function getTemplateFile($file, $root = '')
-	{
-		$a = get_app();
-		$template_file = get_template_file($a, SMARTY3_TEMPLATE_FOLDER . '/' . $file, $root);
-		$template = new FriendicaSmarty();
-		$template->filename = $template_file;
-
-		return $template;
-	}
-}
+<?php
+/**
+ * @file src/Render/FriendicaSmartyEngine.php
+ */
+namespace Friendica\Render;
+
+use Friendica\Core\Addon;
+
+/**
+ * Smarty implementation of the Friendica template engine interface
+ *
+ * @author Hypolite Petovan <hypolite@mrpetovan.com>
+ */
+class FriendicaSmartyEngine implements ITemplateEngine
+{
+	static $name = "smarty3";
+
+	public function __construct()
+	{
+		if (!is_writable('view/smarty3/')) {
+			echo "<b>ERROR:</b> folder <tt>view/smarty3/</tt> must be writable by webserver.";
+			killme();
+		}
+	}
+
+	// ITemplateEngine interface
+	public function replaceMacros($s, $r)
+	{
+		$template = '';
+		if (gettype($s) === 'string') {
+			$template = $s;
+			$s = new FriendicaSmarty();
+		}
+
+		$r['$APP'] = \get_app();
+
+		// "middleware": inject variables into templates
+		$arr = [
+			"template" => basename($s->filename),
+			"vars" => $r
+		];
+		Addon::callHooks("template_vars", $arr);
+		$r = $arr['vars'];
+
+		foreach ($r as $key => $value) {
+			if ($key[0] === '$') {
+				$key = substr($key, 1);
+			}
+
+			$s->assign($key, $value);
+		}
+		return $s->parsed($template);
+	}
+
+	public function getTemplateFile($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;
+	}
+}