Fix for formToken to not need raw filter

tina4stack · Jun 22, 2024 · eafe096 · eafe096
1 parent 1e2722f
commit eafe096
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -79,3 +79,4 @@ test.db
 /src/public/images/test/
 /log/deploy.log
 /bin/tina4
+/src/templates/index.twig
diff --git a/Tina4/Api/Api.php b/Tina4/Api/Api.php
@@ -46,7 +46,7 @@ class Api
 
     /**
      * API constructor.
-     * @param ?string $baseURL
+     * @param string|null $baseURL
      * @param string $authHeader Example - Authorization: Bearer AFD-22323-FD
      * @tests tina4
      *   assert ("https://the-one-api.dev/v2", "Authorization: Bearer 123456") === null,"Could not initialize API"

diff --git a/Tina4/Twig/TwigUtility.php b/Tina4/Twig/TwigUtility.php
@@ -36,7 +36,7 @@ public static function initTwig(?Config $config = null): Environment
                 $twigPaths = ["cache", "src" . DIRECTORY_SEPARATOR . "templates", "src" . DIRECTORY_SEPARATOR . "public", "src" . DIRECTORY_SEPARATOR . "assets", "src" . DIRECTORY_SEPARATOR . "templates" . DIRECTORY_SEPARATOR . "snippets"];
             }
 
-            Debug::message("TINA4: Twig Paths - " . str_replace("\n", "", print_r($twigPaths, 1)), TINA4_LOG_DEBUG);
+            Debug::message("TINA: Twig Paths - " . str_replace("\n", "", print_r($twigPaths, 1)), TINA4_LOG_DEBUG);
 
             foreach ($twigPaths as $tid => $twigPath) {
                 if (!is_array($twigPath) && !file_exists($twigPath) && !file_exists(str_replace(DIRECTORY_SEPARATOR . DIRECTORY_SEPARATOR, DIRECTORY_SEPARATOR, TINA4_DOCUMENT_ROOT . $twigPath))) {
@@ -139,7 +139,7 @@ public static function initTwig(?Config $config = null): Environment
 
                 $filter = new TwigFilter("formToken", static function ($payload) use ($auth) {
                     if (!empty($_SERVER) && isset($_SERVER["REMOTE_ADDR"])) {
-                        return _input(["type" => "hidden", "name" => "formToken", "value" => $auth->getToken(["formName" => $payload])]) . "";
+                        return new \Twig\Markup(_input(["type" => "hidden", "name" => "formToken", "value" => $auth->getToken(["formName" => $payload])]) . "", "UTF-8");
                     }
 
                     return "";