VENOM-10: WIP

This commit is contained in:
Maurice Grönwoldt 2020-11-18 17:50:01 +01:00
commit 5c44d50989
33 changed files with 890 additions and 601 deletions

View file

@ -7,6 +7,7 @@ namespace Venom\Views;
use Venom\Core\ArgumentHandler;
use Venom\Core\Config;
use Venom\Helper\MetaGenerator;
use Venom\Helper\TemplateUtil;
use Venom\Venom;
class VenomRenderer
@ -52,8 +53,7 @@ class VenomRenderer
public function renderTemplate($template): void
{
// random variable name... to remove it instantly
echo $this->includeTemplate($template, '1408138186');
unset($this->vars['1408138186']);
echo TemplateUtil::includeTemplate($template);
}
/**
@ -64,16 +64,9 @@ class VenomRenderer
*/
public function includeTemplate($template, $varName = '')
{
$template .= '.php';
if (file_exists($this->templateDir . $template)) {
ob_start();
include_once $this->templateDir . $template;
$data = ob_get_clean();
$this->vars[$varName] = $data;
return $data;
}
$this->vars[$varName] = '';
return '';
$data = TemplateUtil::includeTemplate($template);
$this->vars[$varName] = $data;
return $data;
}
public function addVar($name, $value): void
@ -94,17 +87,12 @@ class VenomRenderer
public function init(?RenderController $controller): void
{
$this->controller = $controller;
$data = Config::getInstance()->getRenderer();
$theme = $data->theme;
$base = $data->baseFile ?? 'base';
$this->metaGenerator = new MetaGenerator();
if (Config::getInstance()->isAdmin()) {
$base = 'base';
$theme = 'admin';
} else {
if (!Config::getInstance()->isAdmin()) {
$this->metaGenerator = new MetaGenerator();
$this->metaGenerator->loadById();
}
$this->baseTemplate = $base . '.php';
$this->templateDir = __DIR__ . '/../../../tpl/' . $theme . '/';
$util = TemplateUtil::getInstance();
$this->templateDir = $util->getDir();
$this->baseTemplate = $util->getBase();
}
}