clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Move SMARTY3_TEMPLATE_FOLDER to FriendicaSmarty 

- Copy get_template_file into only class calling it
This commit is contained in:
Hypolite Petovan 2018-02-03 08:52:43 -05:00
parent 2a00ac790f
commit 411a400472
2 changed files with 31 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Render/FriendicaSmarty.php
View File

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

27
src/Render/FriendicaSmartyEngine.php
View File

@ -6,8 +6,11 @@ namespace Friendica\Render;
use Friendica\Core\Addon; 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 class FriendicaSmartyEngine implements ITemplateEngine
{ {
static $name = "smarty3"; static $name = "smarty3";
@ -52,8 +55,26 @@ class FriendicaSmartyEngine implements ITemplateEngine
public function getTemplateFile($file, $root = '') public function getTemplateFile($file, $root = '')
{ {
$a = get_app(); $a = get_app();
$template_file = get_template_file($a, SMARTY3_TEMPLATE_FOLDER . '/' . $file, $root);
$template = new FriendicaSmarty(); $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; $template->filename = $template_file;
return $template; return $template;