From d8eaa2ce1a6bfaa36728b5c737962779fe35fc7a Mon Sep 17 00:00:00 2001
From: trendschau <trendschau@gmail.com>
Date: Mon, 9 Sep 2024 20:52:01 +0200
Subject: [PATCH] V 2.9.0 Add event onTwigGlobalsLoaded

---
 .../ControllerApiSystemExtensions.php         |  4 +++-
 .../typemill/Events/OnTwigGlobalsLoaded.php   | 14 ++++++++++++
 system/typemill/Models/License.php            |  4 ++--
 .../typemill/author/js/vue-blox-components.js |  1 +
 system/typemill/author/js/vue-blox.js         |  2 +-
 system/typemill/system.php                    | 22 ++++++++++++++-----
 6 files changed, 37 insertions(+), 10 deletions(-)
 create mode 100644 system/typemill/Events/OnTwigGlobalsLoaded.php

diff --git a/system/typemill/Controllers/ControllerApiSystemExtensions.php b/system/typemill/Controllers/ControllerApiSystemExtensions.php
index 7343e1c..40cb4b2 100644
--- a/system/typemill/Controllers/ControllerApiSystemExtensions.php
+++ b/system/typemill/Controllers/ControllerApiSystemExtensions.php
@@ -57,7 +57,9 @@ class ControllerApiSystemExtensions extends Controller
 				$license 		= new License();
 				$urlinfo 		= $this->c->get('urlinfo');
 
-				if(!$license->checkIfTest($urlinfo))
+				$test = $license->checkIfTest($urlinfo);
+
+				if($license->checkIfTest($urlinfo) !== true)
 				{
 					# checks if license is valid and returns scope
 					$licenseScope 	= $license->getLicenseScope($urlinfo);
diff --git a/system/typemill/Events/OnTwigGlobalsLoaded.php b/system/typemill/Events/OnTwigGlobalsLoaded.php
new file mode 100644
index 0000000..119c462
--- /dev/null
+++ b/system/typemill/Events/OnTwigGlobalsLoaded.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace Typemill\Events;
+
+use Symfony\Component\EventDispatcher\Event;
+
+/**
+ * Event for breadcrumb.
+ */
+ 
+class OnTwigGlobalsLoaded extends BaseEvent
+{
+
+}
\ No newline at end of file
diff --git a/system/typemill/Models/License.php b/system/typemill/Models/License.php
index fb7497d..59751bc 100644
--- a/system/typemill/Models/License.php
+++ b/system/typemill/Models/License.php
@@ -170,8 +170,8 @@ class License
 		$thishost 			= parse_url($urlinfo['baseurl'], PHP_URL_HOST);
 		$thishost 			= str_replace("www.", "", $thishost);
 		$test 				= substr($thishost, 0, 9);
-		
-		if($test == 'localhost' OR $test = '127.0.0.1')
+
+		if($test == 'localhost' OR $test == '127.0.0.1')
 		{
 			return true;
 		}
diff --git a/system/typemill/author/js/vue-blox-components.js b/system/typemill/author/js/vue-blox-components.js
index 8fd8c91..8e88e86 100644
--- a/system/typemill/author/js/vue-blox-components.js
+++ b/system/typemill/author/js/vue-blox-components.js
@@ -19,6 +19,7 @@ bloxeditor.component('title-component', {
 	methods: {
 		beforeSave()
 		{
+			/* You can do something here before save. Check image and file component */
 			this.$emit('saveBlockEvent');
 		},
 		updatemarkdown(content)
diff --git a/system/typemill/author/js/vue-blox.js b/system/typemill/author/js/vue-blox.js
index 1f16b8f..433c7dc 100644
--- a/system/typemill/author/js/vue-blox.js
+++ b/system/typemill/author/js/vue-blox.js
@@ -52,7 +52,7 @@ const bloxeditor = Vue.createApp({
 		},
 		hideEditor()
 		{
-			this.showblox =false;
+			this.showblox = false;
 		},
 		checkMove(event)
 		{
diff --git a/system/typemill/system.php b/system/typemill/system.php
index 14aa1ea..a02daa8 100644
--- a/system/typemill/system.php
+++ b/system/typemill/system.php
@@ -23,6 +23,7 @@ use Typemill\Events\OnSessionSegmentsLoaded;
 use Typemill\Events\OnRolesPermissionsLoaded;
 use Typemill\Events\OnResourcesLoaded;
 use Typemill\Events\OnCspLoaded;
+use Typemill\Events\OnTwigGlobalsLoaded;
 use Typemill\Middleware\RemoveCredentialsMiddleware;
 use Typemill\Middleware\SessionMiddleware;
 use Typemill\Middleware\OldInputMiddleware;
@@ -54,7 +55,6 @@ ini_set('display_errors', $display_errors);
 ini_set('display_startup_errors', 0);
 error_reporting(E_ALL);
 
-
 /****************************
 * LOAD SETTINGS				*
 ****************************/
@@ -279,6 +279,14 @@ else
 
 $timer['session segments'] = microtime(true);
 
+# initialize globals
+$TwigGlobals = ['errors' => NULL, 'flash' => NULL, 'assets' => NULL];
+$TwigGlobals = $dispatcher->dispatch(new OnTwigGlobalsLoaded($TwigGlobals), 'onTwigGlobalsLoaded')->getData();
+
+# echo '<pre>';
+# print_r($TwigGlobals);
+# die();
+
 /****************************
 * OTHER CONTAINER ITEMS			*
 ****************************/
@@ -298,7 +306,7 @@ $container->set('assets', function() use ($assets){ return $assets; });
 * TWIG TO CONTAINER					*
 ****************************/
 
-$container->set('view', function() use ($settings, $urlinfo, $translations, $dispatcher) {
+$container->set('view', function() use ($settings, $TwigGlobals, $urlinfo, $translations, $dispatcher) {
 
 	$twig = Twig::create(
 		[
@@ -314,10 +322,12 @@ $container->set('view', function() use ($settings, $urlinfo, $translations, $dis
 			'autoescape' => false
 		]
 	);
-	
-	$twig->getEnvironment()->addGlobal('errors', NULL);
-	$twig->getEnvironment()->addGlobal('flash', NULL);
-	$twig->getEnvironment()->addGlobal('assets', NULL);
+
+	foreach($TwigGlobals as $name => $feature)
+	{
+#		echo $name . ';';
+		$twig->getEnvironment()->addGlobal($name, $feature);
+	}
 
 	# add extensions
 	$twig->addExtension(new DebugExtension());