From 7da2ac7d2aa021fc86b8739b406f9d95c7fbc01e Mon Sep 17 00:00:00 2001 From: Christian Moser Date: Sun, 1 Dec 2024 18:26:02 +0100 Subject: [PATCH] 2024.12.01 18:26:02 --- src/Controller/MainController.php | 2 +- src/Controller/WebrootController.php | 32 ++++++++++++++++++---------- templates/base.html.twig | 3 ++- 3 files changed, 24 insertions(+), 13 deletions(-) diff --git a/src/Controller/MainController.php b/src/Controller/MainController.php index 3f2aafd..1b45954 100644 --- a/src/Controller/MainController.php +++ b/src/Controller/MainController.php @@ -24,7 +24,7 @@ class MainController extends WebrootController } return $this->render('main/index.html.twig', array_merge( - $this->getControllerVariables(), + $this->getControllerVariables(), [ 'user' => $user, ])); diff --git a/src/Controller/WebrootController.php b/src/Controller/WebrootController.php index a7ef359..1c52a2b 100644 --- a/src/Controller/WebrootController.php +++ b/src/Controller/WebrootController.php @@ -5,28 +5,38 @@ namespace App\Controller; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\Routing\Attribute\Route; +use \Symfony\Component\HttpKernel\KernelInterface; + abstract class WebrootController extends AbstractController { + private ?string $project_dir = null; + + public function __construct(KernelInterface $kernel) + { + $this->project_dir = $kernel->getProjectDir(); + } + public function getHeaderTitleFiglet(): ?string { - $header_title_figlet_file = getenv("HEADER_TITLE_FIGLET"); - if ($header_title_figlet_file && strlen($header_title_figlet_file)) { - $figlet_file = fopen($header_title_figlet_file,"r"); - $header_figlet = fread($figlet_file, filesize($header_title_figlet_file)); - fclose($figlet_file); - $title = "
"
-                    . $header_figlet
-                    . "
"; - return $title; + $filename = getenv("HEADER_TITLE_FIGLET"); + if (!$filename || !strlen($filename) || !file_exists($filename)) { + $filename = join(DIRECTORY_SEPARATOR,[dirname(dirname(__DIR__)),"templates","webroot.txt"]); } - return null; + $figlet_file = fopen($filename,"r"); + $header_figlet = fread($figlet_file, filesize($filename)); + fclose($figlet_file); + $title = "
"
+                . $header_figlet
+                . "
"; + return $title; + return $title; } protected function getControllerVariables(): array { return [ - "header_title_figlet" => $this->getHeaderTitleFiglet(), + "header_title" => $this->getHeaderTitleFiglet(), ]; } } diff --git a/templates/base.html.twig b/templates/base.html.twig index 62f1699..647c7bd 100644 --- a/templates/base.html.twig +++ b/templates/base.html.twig @@ -14,13 +14,14 @@ {% block body %}
- {% block header %}{% if header_title|default(null) %}{{ header_title|raw }}{% else %} + {% block header %}{% if header_title|default %}{{ header_title|raw }}{% else %}
               _                     _   
 __      _____| |__  _ __ ___   ___ | |_ 
 \ \ /\ / / _ \ '_ \| '__/ _ \ / _ \| __|
  \ V  V /  __/ |_) | | | (_) | (_) | |_ 
   \_/\_/ \___|_.__/|_|  \___/ \___/ \__|
+123
 
{% endif %} {% endblock %}