franzholz · Poepp · Dec 5, 2019
diff --git a/Classes/Backend/ExtensionManagerConfiguration.php b/Classes/Backend/ExtensionManagerConfiguration.php
@@ -29,6 +29,7 @@
  ***************************************************************/
 
 use TYPO3\CMS\Core\Utility\GeneralUtility;
+use TYPO3\CMS\Core\Configuration\ExtensionConfiguration;
 
 /**
  * Class that renders fields for the extensionmanager configuration
@@ -111,7 +112,7 @@ public function checkConfig()
 			'useSelectInsteadCheckbox',
 			'allowedDbTypesForCaption',
 		);
-		$confArr = unserialize($GLOBALS['TYPO3_CONF_VARS']['EXT']['extConf']['imagecycle']);
+		$confArr = GeneralUtility::makeInstance(ExtensionConfiguration::class)->get('backend');
 		foreach ($confDefault as $val) {
 			if (!isset($confArr[$val]) && !isset($_POST['data'][$val])) {
 				return false;

diff --git a/Classes/Backend/ItemsProcFunc.php b/Classes/Backend/ItemsProcFunc.php
@@ -28,7 +28,7 @@
 use TYPO3\CMS\Backend\Utility\BackendUtility;
 use TYPO3\CMS\Core\Messaging\FlashMessage;
 use TYPO3\CMS\Core\Messaging\FlashMessageQueue;
-use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
+use TYPO3\CMS\Core\Configuration\ExtensionConfiguration;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 
 
@@ -47,7 +47,7 @@ class ItemsProcFunc
 	 */
 	public function getEffects($config, $item)
 	{
-		$confArr = unserialize($GLOBALS['TYPO3_CONF_VARS']['EXT']['extConf']['imagecycle']);
+		$confArr = GeneralUtility::makeInstance(ExtensionConfiguration::class)->get('backend');
 		$availableEffects = GeneralUtility::trimExplode(',', $confArr['effects'], true);
 		if (count($availableEffects) < 1) {
 			$availableEffects = array('none','blindX','blindY','blindZ','cover','curtainX','curtainY','fade','fadeout','fadeZoom','growX','growY','scrollUp','scrollDown','scrollLeft','scrollRight','scrollHorz','scrollVert','shuffle','slideX','slideY','toss','turnUp','turnDown','turnLeft','turnRight','uncover','wipe','zoom','all');
@@ -84,7 +84,7 @@ public function getEffects($config, $item)
 	 */
 	public function getEffectsCoin($config, $item)
 	{
-		$confArr = unserialize($GLOBALS['TYPO3_CONF_VARS']['EXT']['extConf']['imagecycle']);
+	    $confArr = GeneralUtility::makeInstance(ExtensionConfiguration::class)->get('backend');
 		$availableEffects = GeneralUtility::trimExplode(',', $confArr['effectsCoin'], true);
 		if (count($availableEffects) < 1) {
 			$availableEffects = array('random','swirl','rain','straight');
@@ -121,7 +121,7 @@ public function getEffectsCoin($config, $item)
 	 */
 	public function getEffectsNivo($config, $item)
 	{
-		$confArr = unserialize($GLOBALS['TYPO3_CONF_VARS']['EXT']['extConf']['imagecycle']);
+	    $confArr = GeneralUtility::makeInstance(ExtensionConfiguration::class)->get('backend');
 		$availableEffects = GeneralUtility::trimExplode(',', $confArr['effectsNivo'], true);
 		if (count($availableEffects) < 1) {
 			$availableEffects = array('random','sliceDown','sliceDownLeft','sliceUp','sliceUpLeft','sliceUpDown','sliceUpDownLeft','fold','fade','slideInRight','slideInLeft', 'boxRandom', 'boxRain', 'boxRainReverse', 'boxRainGrow', 'boxRainGrowReverse');
@@ -158,7 +158,7 @@ public function getEffectsNivo($config, $item)
 	*/
 	public function getThemesNivo($config, $item)
 	{
-		$confArr = unserialize($GLOBALS['TYPO3_CONF_VARS']['EXT']['extConf']['imagecycle']);
+	    $confArr = GeneralUtility::makeInstance(ExtensionConfiguration::class)->get('backend');
 		if (! is_dir(GeneralUtility::getFileAbsFileName($confArr['nivoThemeFolder']))) {
 			// if the defined folder does not exist, define the default folder
 			GeneralUtility::devLog('Path \''.$confArr['nivoThemeFolder'].'\' does not exist', 'imagecycle', 1);

diff --git a/Classes/Controller/PageRenderer.php b/Classes/Controller/PageRenderer.php
@@ -30,6 +30,7 @@
 use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Core\Utility\VersionNumberUtility;
+use TYPO3\CMS\Frontend\Resource\FilePathSanitizer;
 
 /**
  * This class implements a all needed functions to add Javascripts and Stylesheets to a page
@@ -170,7 +171,10 @@ public function addResources() {
 	 * @return string
 	 */
 	public function getPath($path = '') {
-		return $this->getTypoScriptFrontendController()->tmpl->getFileName($path);
+        if ($path !== '')
+            return GeneralUtility::makeInstance(FilePathSanitizer::class)->sanitize($path);
+
+        return $path;
 	}
 
 	/**

diff --git a/Classes/Controller/WizardIcon.php b/Classes/Controller/WizardIcon.php
@@ -66,7 +66,7 @@ public function proc (array $wizardItems)
         foreach ($wizardArray as $type => $wizardConf) {
             $params = '&defVals[tt_content][CType]=list&defVals[tt_content][list_type]=' . $wizardConf['list_type'];
             $wizardItem = array(
-                'title' => $GLOBALS['LANG']->sL('LLL:EXT:' . IMAGECYLCE_EXT . 'locallang.xml:' . $type . '_title')
+                'title' => $GLOBALS['LANG']->sL('LLL:EXT:' . IMAGECYLCE_EXT . 'locallang.xml:' . $type . '_title'),
                 'description' => $GLOBALS['LANG']->sL('LLL:EXT:' . IMAGECYLCE_EXT . DIV2007_LANGUAGE_SUBPATH . 'locallang.xml:' . $type . '_plus_wiz_description'),
                 'params' => $params
             );

diff --git a/Classes/Form/FormDataProvider/AllowedGroupField.php b/Classes/Form/FormDataProvider/AllowedGroupField.php
@@ -15,6 +15,7 @@
  */
 
 use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
+use TYPO3\CMS\Core\Configuration\ExtensionConfiguration;
 use TYPO3\CMS\Backend\Form\FormDataProviderInterface;
 use TYPO3\CMS\Backend\Form\FormDataProvider\AbstractItemProvider;
 
@@ -67,7 +68,7 @@ protected function getAllowedTypesForCaption()
     {
         $allowedTypesForCaption = '';
 
-        $configuration = unserialize($GLOBALS['TYPO3_CONF_VARS']['EXT']['extConf']['imagecycle']);
+        $configuration = GeneralUtility::makeInstance(ExtensionConfiguration::class)->get('backend');
         if (!empty($configuration['allowedDbTypesForCaption'])) {
             $allowedTypesForCaption = $configuration['allowedDbTypesForCaption'];
         }

diff --git a/Classes/Form/FormDataProvider/SelectOrCheckboxField.php b/Classes/Form/FormDataProvider/SelectOrCheckboxField.php
@@ -17,6 +17,7 @@
 use TYPO3\CMS\Core\Utility\MathUtility;
 use TYPO3\CMS\Backend\Form\FormDataProviderInterface;
 use TYPO3\CMS\Backend\Form\FormDataProvider\AbstractItemProvider;
+use TYPO3\CMS\Core\Configuration\ExtensionConfiguration;
 
 /**
  * Resolves custom select or checkbox field.
@@ -71,7 +72,7 @@ public function addData(array $result)
      */
     protected function useSelectInsteadCheckbox()
     {
-        $configuration = unserialize($GLOBALS['TYPO3_CONF_VARS']['EXT']['extConf']['imagecycle']);
+        $configuration = GeneralUtility::makeInstance(ExtensionConfiguration::class)->get('backend');
         return (!empty($configuration['useSelectInsteadCheckbox']));
     }
 }
diff --git a/Classes/Miscellaneous/TtNewsUserFunctions.php b/Classes/Miscellaneous/TtNewsUserFunctions.php
@@ -32,6 +32,7 @@
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Core\Utility\MathUtility;
 use TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer;
+use TYPO3\CMS\Frontend\Resource\FilePathSanitizer;
 
 class TtNewsUserFunctions {
 	/**
@@ -120,7 +121,7 @@ public function getSlideshow($content, $conf) {
 			$instanceClass = ($conf['instanceClass'] ? $conf['instanceClass'] : ExtensionManagementUtility::extPath('imagecycle').'pi1/class.tx_imagecycle_pi1.php');
 			if (! file_exists($instanceClass)) {
 				// try to get the filename if file not exists
-				$instanceClass = $GLOBALS['TSFE']->tmpl->getFileName($instanceClass);
+				$instanceClass = GeneralUtility::makeInstance(FilePathSanitizer::class)->sanitize($instanceClass);
 			}
 			if (! file_exists($instanceClass)) {
 				GeneralUtility::devLog('Class \''.$instanceClass.'\' not found', 'imagecycle', 1);
@@ -131,12 +132,17 @@ public function getSlideshow($content, $conf) {
 			/** @var tx_imagecycle_pi1 $obj */
 			$obj = GeneralUtility::makeInstance($instance);
 			$obj->setContentKey($obj->extKey . '_' . $this->cObj->data['uid']);
+			// @extensionScannerIgnoreLine
 			$obj->conf = $GLOBALS['TSFE']->tmpl->setup['plugin.'][$instance . '.'];
 			// overwrite the width and height of the config
+			// @extensionScannerIgnoreLine
 			$obj->conf['imagewidth'] = $GLOBALS['TSFE']->register['imagewidth'];
+			// @extensionScannerIgnoreLine
 			$obj->conf['imageheight'] = $GLOBALS['TSFE']->register['imageheight'];
 			if ($this->cObj->data['tx_imagecycle_duration'] > 0) {
+			    // @extensionScannerIgnoreLine
 				$obj->conf['displayDuration'] = $this->cObj->data['tx_imagecycle_duration'];
+				// @extensionScannerIgnoreLine
 				$obj->conf['nivoPauseTime'] = $this->cObj->data['tx_imagecycle_duration'];
 			}
 			$obj->cObj = $this->cObj;

diff --git a/Configuration/TCA/Overrides/tt_content.php b/Configuration/TCA/Overrides/tt_content.php
@@ -3,20 +3,20 @@
 
 $table = 'tt_content';
 
-$relativeExtensionPath = 'EXT:' . IMAGECYLCE_EXT . '/'; 
+$relativeExtensionPath = 'EXT:imagecycle/'; 
 
 // CONTENT
 $tempColumns = array(
     'tx_imagecycle_activate' => array(
         'exclude' => 1,
-        'label' => 'LLL:EXT:' . IMAGECYLCE_EXT . '/locallang_db.xml:' . $table . '.tx_imagecycle_activate',
+        'label' => 'LLL:EXT:imagecycle/locallang_db.xml:' . $table . '.tx_imagecycle_activate',
         'config' => array(
             'type' => 'check',
         )
     ),
     'tx_imagecycle_duration' => array(
         'exclude' => 1,
-        'label' => 'LLL:EXT:' . IMAGECYLCE_EXT . '/locallang_db.xml:' . $table . '.tx_imagecycle_duration',
+        'label' => 'LLL:EXT:imagecycle/locallang_db.xml:' . $table . '.tx_imagecycle_duration',
         'config' => array(
             'type' => 'input',
             'size' => '5',
@@ -31,41 +31,41 @@
     'showitem' => 'tx_imagecycle_activate,tx_imagecycle_duration',
     'canNotCollapse' => 1,
 );
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addToAllTCAtypes($table, '--palette--;LLL:EXT:' . IMAGECYLCE_EXT . '/locallang_db.xml:' . $table . '.tx_imagecycle_title;tx_imagecycle', 'textpic,image', 'before:imagecaption');
+\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addToAllTCAtypes($table, '--palette--;LLL:EXT:imagecycle/locallang_db.xml:' . $table . '.tx_imagecycle_title;tx_imagecycle', 'textpic,image', 'before:imagecaption');
 
 $listType = 'imagecycle_pi1';
 
 // ICON pi1
 \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPlugin(
     array(
-        'LLL:EXT:' . IMAGECYLCE_EXT . '/locallang_db.xml:' . $table . '.list_type_pi1',
+        'LLL:EXT:imagecycle/locallang_db.xml:' . $table . '.list_type_pi1',
         $listType,
         $relativeExtensionPath . 'pi1/ce_icon.gif'
     ),
     'list_type',
-    IMAGECYLCE_EXT
+    'imagecycle'
 );
 
 \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue(
     $listType,
-    'FILE:EXT:' . IMAGECYLCE_EXT . '/pi1/flexform_ds.xml'
+    'FILE:EXT:imagecycle/pi1/flexform_ds.xml'
 );
 
 $listType = 'imagecycle_pi2';
 
 // ICON pi2
 \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPlugin(
     array(
-        'LLL:EXT:' . IMAGECYLCE_EXT . '/locallang_db.xml:' . $table . '.list_type_pi2', 
+        'LLL:EXT:imagecycle/locallang_db.xml:' . $table . '.list_type_pi2',
         $listType,
         $relativeExtensionPath . 'pi2/ce_icon.gif'
     ),
     'list_type',
-    IMAGECYLCE_EXT
+    'imagecycle'
 );
 \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue(
     $listType,
-    'FILE:EXT:' . IMAGECYLCE_EXT . '/pi2/flexform_ds.xml'
+    'FILE:EXT:imagecycle/pi2/flexform_ds.xml'
 );
 
 $listType = 'imagecycle_pi3';
@@ -78,45 +78,45 @@
         $relativeExtensionPath . 'pi3/ce_icon.gif'
     ),
     'list_type',
-    IMAGECYLCE_EXT
+    'imagecycle'
 );
 \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue(
     $listType, 
-    'FILE:EXT:' . IMAGECYLCE_EXT . '/pi3/flexform_ds.xml'
+    'FILE:EXT:imagecycle/pi3/flexform_ds.xml'
 );
 
 $listType = 'imagecycle_pi4';
 
 // ICON pi4
 \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPlugin(
     array(
-        'LLL:EXT:' . IMAGECYLCE_EXT . '/locallang_db.xml:' . $table . '.list_type_pi4',
+        'LLL:EXT:imagecycle/locallang_db.xml:' . $table . '.list_type_pi4',
         $listType,
         $relativeExtensionPath . 'pi4/ce_icon.gif'
     ),
     'list_type',
-    IMAGECYLCE_EXT
+    'imagecycle'
 );
 \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue(
     $listType,
-    'FILE:EXT:' . IMAGECYLCE_EXT .'/pi4/flexform_ds.xml'
+    'FILE:EXT:imagecycle/pi4/flexform_ds.xml'
 );
 
 $listType = 'imagecycle_pi5';
 
 // ICON pi5
 \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPlugin(
     array(
-        'LLL:EXT:' . IMAGECYLCE_EXT . '/locallang_db.xml:' . $table . '.list_type_pi5',
+        'LLL:EXT:imagecycle/locallang_db.xml:' . $table . '.list_type_pi5',
         $listType,
         $relativeExtensionPath . 'pi5/ce_icon.gif'
     ),
     'list_type',
-    IMAGECYLCE_EXT
+    'imagecycle'
 );
 \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue(
     $listType,
-    'FILE:EXT:' . IMAGECYLCE_EXT . '/pi5/flexform_ds.xml'
+    'FILE:EXT:imagecycle/pi5/flexform_ds.xml'
 );
 
 $GLOBALS['TCA'][$table]['types']['list']['subtypes_excludelist']['imagecycle_pi1'] = 'layout,select_key,pages';

diff --git a/ext_tables.php b/ext_tables.php
@@ -1,12 +1,12 @@
 <?php
 defined('TYPO3_MODE') || die('Access denied.');
 
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addStaticFile(IMAGECYLCE_EXT, 'static/', 'Image-Cycle');
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addStaticFile(IMAGECYLCE_EXT, 'static/tt_content/', 'Image-Cycle for tt_content');
+\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addStaticFile('imagecycle', 'static/', 'Image-Cycle');
+\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addStaticFile('imagecycle', 'static/tt_content/', 'Image-Cycle for tt_content');
 
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addStaticFile(IMAGECYLCE_EXT, 'static/coinslider/', 'Coin-Slider');
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addStaticFile(IMAGECYLCE_EXT, 'static/nivoslider/', 'Nivo-Slider');
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addStaticFile(IMAGECYLCE_EXT, 'static/crossslide/', 'Cross-Slide');
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addStaticFile(IMAGECYLCE_EXT, 'static/slicebox/',   'Slice-Box');
+\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addStaticFile('imagecycle', 'static/coinslider/', 'Coin-Slider');
+\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addStaticFile('imagecycle', 'static/nivoslider/', 'Nivo-Slider');
+\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addStaticFile('imagecycle', 'static/crossslide/', 'Cross-Slide');
+\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addStaticFile('imagecycle', 'static/slicebox/',   'Slice-Box');