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

Merge pull request #8545 from nupplaphil/bug/subdir 

Template Engine with Subdirectory
This commit is contained in:
Hypolite Petovan 2020-04-26 14:31:30 -04:00 committed by GitHub
parent 1b8918351d f5f62d3f42
commit 1b0a8ec5c0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Core/Renderer.php
View File

@ -99,19 +99,18 @@ class Renderer
* Load a given template $s * Load a given template $s
* *
* @param string $s Template to load. * @param string $s Template to load.
* @param string $root Optional. * @param string $subDir Subdirectory (Optional)
* *
* @return string template. * @return string template.
* @throws Exception * @throws Exception
*/ */
public static function getMarkupTemplate($s, $root = '') public static function getMarkupTemplate($s, $subDir = '')
{ {
$stamp1 = microtime(true); $stamp1 = microtime(true);
$a = DI::app();
$t = self::getTemplateEngine(); $t = self::getTemplateEngine();
try { try {
$template = $t->getTemplateFile($s, $root); $template = $t->getTemplateFile($s, $subDir);
} catch (Exception $e) { } catch (Exception $e) {
echo "<pre><b>" . __FUNCTION__ . "</b>: " . $e->getMessage() . "</pre>"; echo "<pre><b>" . __FUNCTION__ . "</b>: " . $e->getMessage() . "</pre>";
exit(); exit();

8
src/DI.php
View File

@ -383,6 +383,14 @@ abstract class DI
return self::$dice->create(Util\ACLFormatter::class); return self::$dice->create(Util\ACLFormatter::class);
} }
/**
* @return string
*/
public static function basePath()
{
return self::$dice->create('$basepath');
}
/** /**
* @return Util\DateTimeFormat * @return Util\DateTimeFormat
*/ */

8
src/Render/FriendicaSmartyEngine.php
View File

@ -68,16 +68,18 @@ class FriendicaSmartyEngine implements ITemplateEngine
return $s->parsed($template); return $s->parsed($template);
} }
public function getTemplateFile($file, $root = '') public function getTemplateFile($file, $subDir = '')
{ {
$a = DI::app(); $a = DI::app();
$template = new FriendicaSmarty(); $template = new FriendicaSmarty();
// Make sure $root ends with a slash / // Make sure $root ends with a slash /
if ($root !== '' && substr($root, -1, 1) !== '/') { if ($subDir !== '' && substr($subDir, -1, 1) !== '/') {
$root = $root . '/'; $subDir = $subDir . '/';
} }
$root = DI::basePath() . '/' . $subDir;
$theme = $a->getCurrentTheme(); $theme = $a->getCurrentTheme();
$filename = $template::SMARTY3_TEMPLATE_FOLDER . '/' . $file; $filename = $template::SMARTY3_TEMPLATE_FOLDER . '/' . $file;

2
src/Render/ITemplateEngine.php
View File

@ -27,5 +27,5 @@ namespace Friendica\Render;
interface ITemplateEngine interface ITemplateEngine
{ {
public function replaceMacros($s, $v); public function replaceMacros($s, $v);
public function getTemplateFile($file, $root = ''); public function getTemplateFile($file, $subDir = '');
} }