typo3 12 compatibility

DMKEBUSINESSGMBH · Feb 18, 2023 · f299d8d · f299d8d
1 parent 54036a5
commit f299d8d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 11 deletions.
diff --git a/Classes/Utility/Configuration.php b/Classes/Utility/Configuration.php
@@ -2,6 +2,7 @@
 namespace WapplerSystems\ZabbixClient\Utility;
 
 use TYPO3\CMS\Core\Configuration\ExtensionConfiguration;
+use TYPO3\CMS\Core\Information\Typo3Version;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface;
 use TYPO3\CMS\Extbase\Object\ObjectManager;
@@ -14,6 +15,11 @@ class Configuration
      */
     public static function getExtConfiguration()
     {
+        if (class_exists(Typo3Version::class)) {
+            return \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(ExtensionConfiguration::class)
+                ->get('zabbix_client');
+        }
+
         if (version_compare(TYPO3_version, '9.0.0', '>=')) {
 
             return \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(ExtensionConfiguration::class)
@@ -45,4 +51,4 @@ public static function getTypoScriptConfiguration(): array
         );
     }
 
-}
+}
diff --git a/ext_localconf.php b/ext_localconf.php
@@ -1,8 +1,6 @@
 <?php
 
-if (!defined('TYPO3_MODE')) {
-    die('Access denied.');
-}
+defined('TYPO3') or die();
 
 if (!isset($GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['zabbix_client']['operations'])) {
     $GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['zabbix_client']['operations'] = [];
@@ -40,7 +38,7 @@
     'HasIPTCPreservation' => \WapplerSystems\ZabbixClient\Operation\HasIPTCPreservation::class,
 ]);
 
-if (version_compare(TYPO3_version, '9.0.0', '>=')) {
+if (defined('TYPO3_version') && version_compare(TYPO3_version, '9.0.0', '>=')) {
     $GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['zabbix_client']['operations'] = array_merge($GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['zabbix_client']['operations'],[
         'HasStrictSyntaxEnabled' => \WapplerSystems\ZabbixClient\Operation\HasStrictSyntaxEnabled::class,
     ]);
@@ -59,6 +57,6 @@
     ],
 ];
 
-if (version_compare(TYPO3_version, '9.0.0', '<') && version_compare(TYPO3_version, '7.4.0', '>=')) {
+if (defined('TYPO3_version') && version_compare(TYPO3_version, '9.0.0', '<') && version_compare(TYPO3_version, '7.4.0', '>=')) {
     $GLOBALS['TYPO3_CONF_VARS']['FE']['eID_include']['zabbixclient'] = \WapplerSystems\ZabbixClient\Middleware\Eid::class . '::processRequest';
 }
diff --git a/ext_tables.php b/ext_tables.php