Projekte/web-base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

replaced confusing loadView behaviour

Browse Source
This commit is contained in:
Roman
2026-05-22 13:47:13 +02:00
parent cc81a9764f
commit 3342d10737
5 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Core/Elements/Link.class.php
View File

@@ -17,7 +17,7 @@ class Link extends StaticView {
private string $href; private string $href;
private ?string $nonce; private ?string $nonce;
function __construct($rel, $href, $type = "") { function __construct(string $rel, string $href, string $type = "") {
$this->href = $href; $this->href = $href;
$this->type = $type; $this->type = $type;
$this->rel = $rel; $this->rel = $rel;

6
Core/Elements/Script.class.php
View File

@@ -18,7 +18,7 @@ class Script extends StaticView {
private string $src; private string $src;
private ?string $nonce; private ?string $nonce;
function __construct($type, $src, $content = "") { function __construct(string $type, string $src, string $content = "") {
$this->src = $src; $this->src = $src;
$this->type = $type; $this->type = $type;
$this->content = $content; $this->content = $content;
@@ -35,8 +35,8 @@ class Script extends StaticView {
$attributes["nonce"] = $this->nonce; $attributes["nonce"] = $this->nonce;
} }
// TODO: do we need to escape the content here? $escapedContent = str_replace("</script>", "<\\/script>", $this->content);
return html_tag("script", $attributes, $this->content, false); return html_tag("script", $attributes, $escapedContent, false);
} }
public function setNonce(string $nonce) { public function setNonce(string $nonce) {

5
Core/Elements/TemplateDocument.class.php
View File

@@ -8,6 +8,7 @@ use Core\Objects\Router\Router;
use Core\Objects\Search\Searchable; use Core\Objects\Search\Searchable;
use Core\Objects\Search\SearchQuery; use Core\Objects\Search\SearchQuery;
use Core\Objects\Search\SearchResult; use Core\Objects\Search\SearchResult;
use Core\Elements\View;
use Twig\Environment; use Twig\Environment;
use Twig\Error\LoaderError; use Twig\Error\LoaderError;
use Twig\Error\RuntimeError; use Twig\Error\RuntimeError;
@@ -126,13 +127,13 @@ class TemplateDocument extends Document {
} }
} }
protected function loadView(string $class): array { protected function loadView(string $class): View {
$view = new $class($this); $view = new $class($this);
$view->loadParameters($this->parameters); $view->loadParameters($this->parameters);
if ($view->getTitle()) { if ($view->getTitle()) {
$this->title = $view->getTitle(); $this->title = $view->getTitle();
} }
return $this->parameters; return $view;
} }
public function doSearch(SearchQuery $query, DocumentRoute $route): array { public function doSearch(SearchQuery $query, DocumentRoute $route): array {

8
Core/Elements/View.class.php
View File

@@ -7,15 +7,15 @@ use Core\Objects\Context;
abstract class View extends StaticView { abstract class View extends StaticView {
private Document $document; private Document $document;
private bool $loadView; private bool $autoload;
protected string $title; protected string $title;
protected array $langModules; protected array $langModules;
public function __construct(Document $document, bool $loadView = true) { public function __construct(Document $document, bool $autoload = true) {
$this->document = $document; $this->document = $document;
$this->title = "Untitled View"; $this->title = "Untitled View";
$this->langModules = []; $this->langModules = [];
$this->loadView = $loadView; $this->autoload = $autoload;
} }
public function getTitle(): string { return $this->title; } public function getTitle(): string { return $this->title; }
@@ -52,7 +52,7 @@ abstract class View extends StaticView {
public function getCode(): string { public function getCode(): string {
// Load metadata + head (title, scripts, includes, ...) // Load metadata + head (title, scripts, includes, ...)
if ($this->loadView) { if ($this->autoload) {
$this->loadView(); $this->loadView();
} }

2
Core/core.php
View File

@@ -10,7 +10,7 @@ if (is_file($autoLoad)) {
require_once $autoLoad; require_once $autoLoad;
} }
const WEBBASE_VERSION = "2.4.6"; const WEBBASE_VERSION = "2.4.7";
spl_autoload_extensions(".php"); spl_autoload_extensions(".php");
spl_autoload_register(function ($class) { spl_autoload_register(function ($class) {