Merge pull request #56 from oveleon/develop

Fix template variable for pages and layouts
oveleon · Dec 20, 2021 · 7475cf0 · 7475cf0
2 parents e8981f8 + c068e1b
commit 7475cf0
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -45,7 +45,7 @@ Search for `oveleon/contao-component-style-manager` in the Contao Manager and ad
 
 #### Manual installation
 ```
-$ composer require oveleon/contao-component-style-manager
+composer require oveleon/contao-component-style-manager
 ```
 
 ## Documentation

diff --git a/src/Resources/contao/classes/StyleManager.php b/src/Resources/contao/classes/StyleManager.php
@@ -111,7 +111,7 @@ public static function clearClasses($varValue, $dc)
 
         if(self::isMultipleField($dc->field))
         {
-            $varValue = serialize(array($cssID[0] ?? '', $varValue));
+            $varValue = serialize(array(($cssID[0] ?? ''), $varValue));
         }
 
         return $varValue;
@@ -147,7 +147,7 @@ public static function updateClasses($varValue, $dc)
 
         if(self::isMultipleField($dc->field))
         {
-            $varValue = serialize(array($cssID[0] ?? '', $varValue));
+            $varValue = serialize(array(($cssID[0] ?? ''), $varValue));
         }
 
         return $varValue;
@@ -198,7 +198,7 @@ public static function resetClasses($varValue, $dc, $strTable)
 
         if(self::isMultipleField($dc->field))
         {
-            $varValue = serialize(array($cssID[0] ?? '', $varValue));
+            $varValue = serialize(array(($cssID[0] ?? ''), $varValue));
         }
 
         return $varValue;
@@ -376,6 +376,23 @@ public static function deserializeValues($arrValue){
         return $arrValue;
     }
 
+    /**
+     * Adding template variables defined in pages and layouts
+     *
+     * @param $objPage
+     * @param $objLayout
+     * @param $page
+     */
+    public function onGeneratePage($objPage, $objLayout, &$page)
+    {
+        $arrStyles = array_filter(array_merge_recursive(
+            StringUtil::deserialize($objPage->styleManager, true),
+            StringUtil::deserialize($objLayout->styleManager, true)
+        ));
+
+        $page->Template->styleManager = serialize($arrStyles);
+    }
+
     /**
      * Parse Template and set Variables
      *

diff --git a/src/Resources/contao/config/config.php b/src/Resources/contao/config/config.php
@@ -31,6 +31,7 @@
 
 // Hooks
 $GLOBALS['TL_HOOKS']['parseTemplate'][]      = array('\\Oveleon\\ContaoComponentStyleManager\\StyleManager', 'onParseTemplate');
+$GLOBALS['TL_HOOKS']['generatePage'][]       = array('\\Oveleon\\ContaoComponentStyleManager\\StyleManager', 'onGeneratePage');
 $GLOBALS['TL_HOOKS']['loadFormField'][]      = array('\\Oveleon\\ContaoComponentStyleManager\\StyleManager', 'onLoadFormField');
 $GLOBALS['TL_HOOKS']['addCustomRegexp'][]    = array('\\Oveleon\\ContaoComponentStyleManager\\StyleManager', 'addVariableRegexp');
 $GLOBALS['TL_HOOKS']['executePostActions'][] = array('\\Oveleon\\ContaoComponentStyleManager\\Ajax', 'executePostActions');