heimrichhannot · ericges · Jan 3, 2024 · Jan 3, 2024 · Feb 15, 2024 · Feb 15, 2024
diff --git a/composer.json b/composer.json
@@ -27,7 +27,7 @@
     },
     "require": {
         "php": "^7.4 || ^8.0",
-        "contao/core-bundle": "^4.9",
+        "contao/core-bundle": "^4.13 || ^5.2",
         "contao-community-alliance/composer-plugin": "~2.4 || ~3.0",
         "menatwork/contao-multicolumnwizard-bundle": "^3.3.7"
     },

diff --git a/config/config.php b/config/config.php
diff --git a/dca/tl_content.php b/dca/tl_content.php
@@ -35,6 +35,7 @@
  */
 
 use Contao\DataContainer;
+use Contao\System;
 use HeimrichHannot\Subcolumns\SubcolumnTypes;
 
 $GLOBALS['TL_DCA']['tl_content']['fields']['sc_name'] = array
@@ -138,8 +139,31 @@
 /**
  * Operations
 **/
-$arrModules = $this->Config->getActiveModules();
-if(!in_array('ce-access',$arrModules))
+$getActiveBundles = function () {
+	$bundles = array_keys(System::getContainer()->getParameter('kernel.bundles'));
+
+	$legacy = [
+		'ContaoCoreBundle'       => 'core',
+		'ContaoCalendarBundle'   => 'calendar',
+		'ContaoCommentsBundle'   => 'comments',
+		'ContaoFaqBundle'        => 'faq',
+		'ContaoListingBundle'    => 'listing',
+		'ContaoNewsBundle'       => 'news',
+		'ContaoNewsletterBundle' => 'newsletter'
+	];
+
+	foreach ($legacy as $bundleName => $module)
+	{
+		if (\in_array($bundleName, $bundles))
+		{
+			$bundles[] = $module;
+		}
+	}
+
+	return $bundles;
+};
+
+if (!in_array('ce-access', $getActiveBundles()))
 {
 	$GLOBALS['TL_DCA']['tl_content']['list']['operations']['edit']['button_callback'] = array('tl_content_sc','showEditOperation'); 
 	$GLOBALS['TL_DCA']['tl_content']['list']['operations']['copy']['button_callback'] = array('tl_content_sc','showCopyOperation'); 

diff --git a/dca/tl_form.php b/dca/tl_form.php
@@ -1,4 +1,4 @@
-<?php if (!defined('TL_ROOT')) die('You can not access this file directly!');
+<?php
 
 /**
  * TYPOlight webCMS
@@ -22,5 +22,3 @@
  */
 
 $GLOBALS['TL_DCA']['tl_form']['config']['oncopy_callback'][] = array('tl_subcolumnsCallback','formCheck');
-
-?>
diff --git a/dca/tl_page.php b/dca/tl_page.php
@@ -1,4 +1,4 @@
-<?php if (!defined('TL_ROOT')) die('You can not access this file directly!');
+<?php
 
 /**
  * TYPOlight webCMS
@@ -22,5 +22,3 @@
  */
 
 $GLOBALS['TL_DCA']['tl_page']['config']['oncopy_callback'][] = array('tl_subcolumnsCallback','pageCheck');
-
-?>
diff --git a/dca/tl_settings.php b/dca/tl_settings.php
@@ -1,4 +1,4 @@
-<?php if (!defined('TL_ROOT')) die('You can not access this file directly!');
+<?php
 
 /**
  * TYPOlight webCMS
@@ -46,5 +46,3 @@
 );
 
 $GLOBALS['TL_DCA']['tl_settings']['palettes']['default'] .= ';{subcolumns_legend:hide},subcolumns,subcolumns_gapdefault;';
-
-?>
diff --git a/languages/de/default.php b/languages/de/default.php
@@ -1,4 +1,4 @@
-<?php if (!defined('TL_ROOT')) die('You can not access this file directly!');
+<?php
 
 /**
  * TYPOlight webCMS
@@ -42,5 +42,3 @@
 
 $GLOBALS['TL_LANG']['MSC']['sets']['yaml3'] = 'YAML3';
 $GLOBALS['TL_LANG']['MSC']['sets']['yaml4'] = 'YAML4';
-
-?>
diff --git a/languages/de/modules.php b/languages/de/modules.php
@@ -1,4 +1,4 @@
-<?php if (!defined('TL_ROOT')) die('You cannot access this file directly!');
+<?php
 
 /**
  * Contao Open Source CMS
@@ -32,6 +32,3 @@
  * Frontend modules
  */
 $GLOBALS['TL_LANG']['FMD']['subcolumns'] = array('Spaltenset', 'Ordnen Sie mehrere Module in mehreren Spalten an. Die Zuweisung erfolgt wie im Seitenlayout.');
-
-
-?>
diff --git a/languages/de/tl_content.php b/languages/de/tl_content.php
@@ -1,4 +1,4 @@
-<?php if (!defined('TL_ROOT')) die('You can not access this file directly!');
+<?php
 
 /**
  * TYPOlight webCMS
@@ -21,7 +21,6 @@
  * @filesource
  */
 
-
 /**
  * Fields
  */
@@ -35,13 +34,8 @@
 $GLOBALS['TL_LANG']['tl_content']['sc_childs'] = array('Kindelemente', '');
 $GLOBALS['TL_LANG']['tl_content']['sc_sortid'] = array('Sortierung im Spaltenset', '');
 
-
 /**
  * Legends
  */
 $GLOBALS['TL_LANG']['tl_content']['colset_legend']      = 'Spaltenset Einstellungen';
 $GLOBALS['TL_LANG']['tl_content']['colheight_legend']      = 'Spaltenhöhe';
-
-
-
-?>
diff --git a/languages/de/tl_form_field.php b/languages/de/tl_form_field.php
@@ -1,4 +1,4 @@
-<?php if (!defined('TL_ROOT')) die('You can not access this file directly!');
+<?php
 
 /**
  * TYPOlight Open Source CMS

diff --git a/languages/de/tl_module.php b/languages/de/tl_module.php
@@ -1,4 +1,4 @@
-<?php if (!defined('TL_ROOT')) die('You can not access this file directly!');
+<?php
 
 /**
  * TYPOlight Open Source CMS
@@ -26,7 +26,6 @@
  * @filesource
  */
 
-
 /**
  * Fields
  */
@@ -36,12 +35,10 @@
 $GLOBALS['TL_LANG']['tl_module']['sc_type'] = array('Spaltenset Typ', 'Wieviele Spalten, mit welchen Breiten soll es geben?<br />Die Zahlen geben die Breite in % an: 25x75 => erste Spalte 25%, zweit Spalte 75% des umschliessenden Containers.');
 $GLOBALS['TL_LANG']['tl_module']['sc_equalize'] = array('gleiche Spaltenhöhe', 'Diese Option setzt alle Spalten auf die Höhe der längsten Spalte. Dies kann sinnvoll genutzt werden, wenn man z.B. Hintergrundgrafiken nutzen möchte.<br />Ein Beispiel findet man auf den Seiten des <a href="http://www.yaml.de/fileadmin/examples/06_layouts_advanced/equal_height_boxes.html" onclick="window.open(this.href); return false;" title="YAML-Framework">YAML-Frameworks</a>.');
 
-
 /**
  * Reference
  */
 $GLOBALS['TL_LANG']['tl_module']['subcolumns_legend']   = 'Spaltenset Auswahl';
 $GLOBALS['TL_LANG']['tl_module']['subcolumns_settings_legend'] = 'Spaltenset Einstellungen';
 $GLOBALS['TL_LANG']['tl_module']['module']       = array('Modul','');
 $GLOBALS['TL_LANG']['tl_module']['column']       = array('Spalte','');
-?>
diff --git a/languages/de/tl_settings.php b/languages/de/tl_settings.php
@@ -1,4 +1,4 @@
-<?php if (!defined('TL_ROOT')) die('You can not access this file directly!');
+<?php
 
 /**
  * TYPOlight webCMS
@@ -21,17 +21,13 @@
  * @filesource
  */
 
-
 /**
  * Fields
  */
 $GLOBALS['TL_LANG']['tl_settings']['subcolumns'] = array('Spaltenset', 'Wählen Sie die Spaltenset-Konfiguration, die Sie verwenden möchten.');
 $GLOBALS['TL_LANG']['tl_settings']['subcolumns_gapdefault'] = array('Spaltenset Standardabstand', 'Geben Sie einen Standardabstand für alle Spaltensets auf der Seite ein.');
 
-
 /**
  * Legends
  */
 $GLOBALS['TL_LANG']['tl_settings']['subcolumns_legend']      = 'Spaltenset Einstellungen';
-
-?>
diff --git a/languages/en/default.php b/languages/en/default.php
@@ -1,4 +1,4 @@
-<?php if (!defined('TL_ROOT')) die('You can not access this file directly!');
+<?php
 
 /**
  * TYPOlight webCMS
@@ -21,8 +21,6 @@
  * @filesource
  */
 
-
-
 /**
  * Miscellaneous
  */
@@ -39,4 +37,3 @@
 $GLOBALS['TL_LANG']['MSC']['sc_third'] = 'third';
 $GLOBALS['TL_LANG']['MSC']['sc_fourth'] = 'fourth';
 $GLOBALS['TL_LANG']['MSC']['sc_fifth'] = 'fifth';
-?>
diff --git a/languages/en/modules.php b/languages/en/modules.php
@@ -1,4 +1,4 @@
-<?php if (!defined('TL_ROOT')) die('You cannot access this file directly!');
+<?php
 
 /**
  * Contao Open Source CMS
@@ -28,11 +28,7 @@
  * @filesource
  */
 
-
 /**
  * Front end modules
  */
 $GLOBALS['TL_LANG']['FMD']['subcolumns'] = array('Column Set', 'Put front end modules inside columns. The allocation is made similar to a page layout.');
-
-
-?>
diff --git a/languages/en/tl_content.php b/languages/en/tl_content.php
@@ -1,4 +1,4 @@
-<?php if (!defined('TL_ROOT')) die('You can not access this file directly!');
+<?php
 
 /**
  * TYPOlight webCMS
@@ -37,5 +37,3 @@
  */
 $GLOBALS['TL_LANG']['tl_content']['colset_legend']      = 'Columnset settings';
 $GLOBALS['TL_LANG']['tl_content']['colheight_legend']      = 'Column height';
-
-?>
diff --git a/languages/en/tl_form_field.php b/languages/en/tl_form_field.php
@@ -1,4 +1,4 @@
-<?php if (!defined('TL_ROOT')) die('You can not access this file directly!');
+<?php
 
 /**
  * TYPOlight Open Source CMS
@@ -26,15 +26,13 @@
  * @filesource
  */
 
-
 /**
  * Form fields
  */
 $GLOBALS['TL_LANG']['FFL']['formcolstart']    = array('Column set start', 'The opening element of a column set');
 $GLOBALS['TL_LANG']['FFL']['formcolpart']    = array('Column set part element', 'The element between two columns.');
 $GLOBALS['TL_LANG']['FFL']['formcolend']    = array('Column set end element', 'The last element of a column set.');
 
-
 /**
  * Fields
  */
@@ -48,5 +46,3 @@
  * Legend
 **/
 $GLOBALS['TL_LANG']['tl_form_field']['colsettings_legend'] = 'Columns Settings';
-
-?>
diff --git a/languages/en/tl_module.php b/languages/en/tl_module.php
@@ -1,4 +1,4 @@
-<?php if (!defined('TL_ROOT')) die('You can not access this file directly!');
+<?php
 
 /**
  * TYPOlight Open Source CMS
@@ -26,7 +26,6 @@
  * @filesource
  */
 
-
 /**
  * Fields
  */
@@ -36,12 +35,10 @@
 $GLOBALS['TL_LANG']['tl_module']['sc_type'] = array('Columns set', 'Select the type of the column set');
 $GLOBALS['TL_LANG']['tl_module']['sc_equalize'] = array('Equal heights', 'Check this box to use the calss equal heights for this columns set.');
 
-
 /**
  * Reference
  */
 $GLOBALS['TL_LANG']['tl_module']['subcolumns_legend']   = 'Column set';
 $GLOBALS['TL_LANG']['tl_module']['subcolumns_settings_legend'] = 'Column set settings';
 $GLOBALS['TL_LANG']['tl_module']['module']       = 'Module';
 $GLOBALS['TL_LANG']['tl_module']['column']       = 'Column';
-?>
diff --git a/languages/en/tl_settings.php b/languages/en/tl_settings.php
@@ -1,4 +1,4 @@
-<?php if (!defined('TL_ROOT')) die('You can not access this file directly!');
+<?php
 
 /**
  * TYPOlight webCMS
@@ -21,7 +21,6 @@
  * @filesource
  */
 
-
 /**
  * Fields
  */
@@ -32,5 +31,3 @@
  * Legends
  */
 $GLOBALS['TL_LANG']['tl_settings']['subcolumns_legend']      = 'Columnset Settings';
-
-?>
diff --git a/languages/sk/default.php b/languages/sk/default.php
@@ -1,4 +1,4 @@
-<?php if (!defined('TL_ROOT')) die('You can not access this file directly!');
+<?php
 
 /**
  * TYPOlight webCMS
@@ -21,8 +21,6 @@
  * @filesource
  */
 
-
-
 /**
  * Miscellaneous
  */
@@ -39,4 +37,3 @@
 $GLOBALS['TL_LANG']['MSC']['sc_third'] = 'tretieho';
 $GLOBALS['TL_LANG']['MSC']['sc_fourth'] = 'štvrtého';
 $GLOBALS['TL_LANG']['MSC']['sc_fifth'] = 'piaty';
-?>
diff --git a/languages/sk/tl_content.php b/languages/sk/tl_content.php
@@ -1,4 +1,4 @@
-<?php if (!defined('TL_ROOT')) die('You can not access this file directly!');
+<?php
 
 /**
  * TYPOlight webCMS
@@ -27,5 +27,3 @@
 $GLOBALS['TL_LANG']['tl_content']['sc_name'] = array('Názov stĺpca', 'Nepovinné. Pomenujte si zoskupenie stĺpcov, ak plánujete použit na stránke viac rôznych stĺpcových elementov.');
 $GLOBALS['TL_LANG']['tl_content']['sc_gap'] = array('Medzistĺpcová medzera', 'Medzistĺpcová medzera medzi dvoma stĺpcami a jednotka. Predvolené nastavenie je 12px.');
 $GLOBALS['TL_LANG']['tl_content']['sc_type'] = array('Typ stĺpcov', 'Koľko stĺpcov bude vytvorených a v akej veľkosti?<br />Číslo reprezentuje šírku stĺpca v percentách: 25x75 => prvý stĺpec bude štvrtina (25 %) a druhý tri štvrtiny (75 %) celej plochy.');
-
-?>
diff --git a/templates/ce_colsetStart.html5 b/templates/ce_colsetStart.html5
@@ -4,6 +4,6 @@
 	<!-- first Column //-->
 	<div class="<?php echo $this->column; ?>">
 		<?php if($this->useInside): ?>
-		<div class="<?php echo $this->inside; ?>"<?php if($this->gap['right'] ?? false): ?> style="padding-right:<?php echo $this->gap['right']; ?>;"<?php endif; ?>>
+		<div class="<?php echo $this->inside; ?>"<?php if ($this->gap['right'] ?? false): ?> style="padding-right:<?php echo $this->gap['right']; ?>;"<?php endif; ?>>
 		<?php endif ?>