[BUGFIX] Compatibility error with current 6.0 master 11/15411/2
authorBenjamin Mack <benni@typo3.org>
Mon, 8 Oct 2012 20:16:19 +0000 (22:16 +0200)
committerPhilipp Schiffmann <philipp.schiffmann@hs-hannover.de>
Mon, 5 Nov 2012 11:31:39 +0000 (12:31 +0100)
The extension is not compatible with 6.0 master as you cannot add
a new storage with type WebDav.

Resolves: #41744

Change-Id: I5ee6c0d033d1df77f371de67633ff39d718d291b

Classes/Driver/WebDavDriver.php
ext_localconf.php

index 22bd13e..1117bc7 100644 (file)
@@ -73,7 +73,7 @@ class WebDavDriver extends \TYPO3\CMS\Core\Resource\Driver\AbstractDriver {
        public function __construct(array $configuration = array()) {
                // TODO Iterate through all string properties and trim them...
                $configuration['baseUrl'] = trim($configuration['baseUrl']);
-               $password = \TYPO3\FalWebdav\Utility\Encryption::decryptPassword($configuration['password']);
+               $password = \TYPO3\FalWebdav\Utility\EncryptionUtility::decryptPassword($configuration['password']);
 
                        // TODO check useAuthentication configuration option
                $this->password = $password;
index 91490e9..25d0ce7 100644 (file)
@@ -4,16 +4,16 @@ if (!defined('TYPO3_MODE')) {
        die('Access denied.');
 }
 
-include_once \TYPO3\CMS\Core\Extension\ExtensionManager::extPath('fal_webdav') . 'Resources/Php/SabreDAV/lib/Sabre/autoload.php';
+include_once \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('fal_webdav') . 'Resources/Php/SabreDAV/lib/Sabre/autoload.php';
 
-$newPath = \TYPO3\CMS\Core\Extension\ExtensionManager::extPath('fal_webdav') . 'Resources/Php/SabreDAV/lib/';
+$newPath = \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('fal_webdav') . 'Resources/Php/SabreDAV/lib/';
 set_include_path($newPath . PATH_SEPARATOR . get_include_path());
 
 /** @var \TYPO3\CMS\Core\Resource\Driver\DriverRegistry $registry */
 $registry = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\CMS\Core\Resource\Driver\DriverRegistry');
 $registry->registerDriverClass('TYPO3\FalWebdav\Driver\WebDavDriver', 'WebDav', 'WebDAV', 'FILE:EXT:fal_webdav/Configuration/FlexForm/WebDavDriverFlexForm.xml');
 
-$TYPO3_CONF_VARS['SC_OPTIONS']['t3lib/class.t3lib_tcemain.php']['processDatamapClass']['fal_webdav'] = 'EXT:fal_webdav/Classes/Backend/TceMainHook.php:&Tx_FalWebdav_Backend_TceMainHook';
+$TYPO3_CONF_VARS['SC_OPTIONS']['t3lib/class.t3lib_tcemain.php']['processDatamapClass']['fal_webdav'] = 'Tx_FalWebdav_Backend_TceMainHook';
 
 
        // Cache configuration, see http://wiki.typo3.org/Caching_Framework