fixup! [TASK] TYPO3 v11 compatibility

jonnsn · Jul 13, 2022 · ead025b · ead025b
1 parent 8c7194d
commit ead025b
Show file tree

Hide file tree

Showing 11 changed files with 134 additions and 117 deletions.
diff --git a/Classes/FileUpload/UploadManager.php b/Classes/FileUpload/UploadManager.php
@@ -18,7 +18,6 @@
 use TYPO3\CMS\Core\Resource\File;
 use TYPO3\CMS\Core\Resource\Security\FileNameValidator;
 use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
-use TYPO3\CMS\Core\Utility\File\BasicFileUtility;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 
 /**

diff --git a/Classes/Service/UploadFileService.php b/Classes/Service/UploadFileService.php
@@ -26,7 +26,7 @@ class UploadFileService
      */
     public function getUploadedFileList($property = '')
     {
-        $parameters = GeneralUtility::_GPmerged('tx_mediaupload_pi1');
+        $parameters = GeneralUtility::_GPmerged('tx_mediaupload_upload');
         return empty($parameters['uploadedFiles'][$property]) ? '' : $parameters['uploadedFiles'][$property];
     }
 

diff --git a/Classes/ViewHelpers/Widget/ShowUploadedViewHelper.php b/Classes/ViewHelpers/Widget/ShowUploadedViewHelper.php
@@ -32,26 +32,26 @@ public function initializeArguments()
             '',
         );
     }
-    public function render(): string
-    {
-        $uploadFileService = GeneralUtility::makeInstance(
-            UploadFileService::class,
-        );
-
-        return static::renderStatic(
-            [
-                'property' => $this->arguments['property'],
-                'uploadedFileList' => $uploadFileService->getUploadedFileList(
-                    $this->arguments['property'],
-                ),
-                'uploadedFiles' => $uploadFileService->getUploadedFiles(
-                    $this->arguments['property'],
-                ),
-            ],
-            $this->buildRenderChildrenClosure(),
-            $this->renderingContext,
-        );
-    }
+    #public function render(): string
+    #{
+    #    $uploadFileService = GeneralUtility::makeInstance(
+    #        UploadFileService::class,
+    #    );
+    #
+    #    return static::renderStatic(
+    #        [
+    #            'property' => $this->arguments['property'],
+    #            'uploadedFileList' => $uploadFileService->getUploadedFileList(
+    #                $this->arguments['property'],
+    #            ),
+    #            'uploadedFiles' => $uploadFileService->getUploadedFiles(
+    #                $this->arguments['property'],
+    #            ),
+    #        ],
+    #        $this->buildRenderChildrenClosure(),
+    #        $this->renderingContext,
+    #    );
+    #}
 
     public static function renderStatic(
         array $arguments,

diff --git a/Classes/ViewHelpers/Widget/UploadViewHelper.php b/Classes/ViewHelpers/Widget/UploadViewHelper.php
@@ -8,9 +8,7 @@
  * LICENSE.md file that was distributed with this source code.
  */
 
-use Fab\Media\Utility\PermissionUtility;
 use Fab\MediaUpload\Service\UploadFileService;
-use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Fluid\View\StandaloneView;
 use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
@@ -66,38 +64,55 @@ public function initializeArguments()
             );
     }
 
-    public function render(): string
-    {
-        $uploadFileService = GeneralUtility::makeInstance(
-            UploadFileService::class,
-        );
-
-        return static::renderStatic(
-            [
-                'allowedExtensions' => $this->arguments['allowedExtensions'],
-                'maximumSize' => $this->arguments['maximumSize'],
-                'maximumSizeLabel' => self::getMaximumSizeLabel(
-                    (int) $this->arguments['maximumSize'],
-                ),
-                'sizeUnit' => $this->arguments['sizeUnit'],
-                'storage' => $this->arguments['storage'],
-                'maximumItems' => $this->arguments['maximumItems'],
-                'property' => $this->arguments['property'],
-                'uploadedFileList' => $uploadFileService->getUploadedFileList(
-                    $this->arguments['property'],
-                ),
-                'widgetIdentifier' => uniqid(),
-            ],
-            $this->buildRenderChildrenClosure(),
-            $this->renderingContext,
-        );
-    }
+    #public function render(): string
+    #{
+    #    $uploadFileService = GeneralUtility::makeInstance(
+    #        UploadFileService::class,
+    #    );
+    #    return static::renderStatic(
+    #        [
+    #            'allowedExtensions' => $this->arguments['allowedExtensions'],
+    #            'maximumSize' => $this->arguments['maximumSize'],
+    #            'maximumSizeLabel' => 'qwer' . self::getMaximumSizeLabel(
+    #                (int) $this->arguments['maximumSize'],
+    #            ),
+    #            'sizeUnit' => $this->arguments['sizeUnit'],
+    #            'storage' => $this->arguments['storage'],
+    #            'maximumItems' => $this->arguments['maximumItems'],
+    #            'property' => $this->arguments['property'],
+    #            'uploadedFileList' => $uploadFileService->getUploadedFileList(
+    #                $this->arguments['property'],
+    #            ),
+    #            'widgetIdentifier' => uniqid(),
+    #        ],
+    #        $this->buildRenderChildrenClosure(),
+    #        $this->renderingContext,
+    #    );
+    #}
 
     public static function renderStatic(
         array $arguments,
         \Closure $renderChildrenClosure,
         RenderingContextInterface $renderingContext
     ): string {
+
+        $uploadFileService = GeneralUtility::makeInstance(
+            UploadFileService::class,
+        );
+
+        $arguments['maximumSizeLabel'] = self::getMaximumSizeLabel(
+            (int)$arguments['maximumSize'],
+        );
+
+        if ($arguments['maximumSize'] === 0) {
+            $arguments['maximumSize'] = GeneralUtility::getMaxUploadFileSize() * 1024;
+        }
+
+        $arguments['uploadedFileList'] = $uploadFileService->getUploadedFileList(
+            $arguments['property'],
+        );
+
+        $arguments['widgetIdentifier'] = uniqid();
         /** @var StandaloneView $view */
         $view = GeneralUtility::makeInstance(StandaloneView::class);
 
@@ -124,7 +139,7 @@ public static function getMaximumSizeLabel(int $maximumSize = 0): int
      */
     public static function getUploadedFileList($property = ''): string
     {
-        $parameters = GeneralUtility::_GPmerged('tx_mediaupload_pi1');
+        $parameters = GeneralUtility::_GPmerged('tx_mediaupload_upload');
         return empty($parameters['uploadedFiles'][$property])
             ? ''
             : $parameters['uploadedFiles'][$property];

diff --git a/Configuration/TypoScript/setup.typoscript b/Configuration/TypoScript/setup.typoscript
@@ -45,12 +45,7 @@ page_1386871773 {
         userFunc = TYPO3\CMS\Extbase\Core\Bootstrap->run
         vendorName = Fab
         extensionName = MediaUpload
-        pluginName = Pi1
-		switchableControllerActions {
-			MediaUpload {
-				1 = upload
-			}
-		}
+        pluginName = Upload
     }
 }
 
@@ -70,14 +65,8 @@ page_1386871774 {
     10 = USER_INT
     10 {
         userFunc = TYPO3\CMS\Extbase\Core\Bootstrap->run
-
         vendorName = Fab
         extensionName = MediaUpload
-        pluginName = Pi1
-        switchableControllerActions {
-            MediaUpload {
-                1 = delete
-            }
-        }
+        pluginName = Delete
     }
-}
+}
diff --git a/Resources/Private/Assets/JavaScript/MediaUpload.js b/Resources/Private/Assets/JavaScript/MediaUpload.js
@@ -72,7 +72,7 @@
 					})
 					.on('submit', {_settings: settings}, function(event) {
 						var params = {};
-						var parameterPrefix = 'tx_mediaupload_pi1';
+						var parameterPrefix = 'tx_mediaupload_upload';
 						params[parameterPrefix + '[storageIdentifier]'] = event.data._settings.storage;
 						params['type'] = '1386871773';
 						$(this).fineUploader('setParams', params);

diff --git a/Resources/Private/Templates/ViewHelpers/Widget/ShowUploaded/Index.html b/Resources/Private/Templates/ViewHelpers/Widget/ShowUploaded/Index.html
@@ -1,7 +1,7 @@
 <div>
 
 	<input id="uploaded-files-{property}" type="hidden"
-	       name="tx_mediaupload_pi1[uploadedFiles][{property}]" value="{uploadedFileList}" />
+	       name="tx_mediaupload_upload[uploadedFiles][{property}]" value="{uploadedFileList}" />
 
 	<f:if condition="{uploadedFiles}">
 		<ul class="qq-upload-list-selector qq-upload-list">
@@ -21,4 +21,4 @@
 
 </div>
 
-{namespace m=TYPO3\CMS\Media\ViewHelpers}
+{namespace m=TYPO3\CMS\Media\ViewHelpers}
diff --git a/Resources/Private/Templates/ViewHelpers/Widget/Upload/Index.html b/Resources/Private/Templates/ViewHelpers/Widget/Upload/Index.html
@@ -1,21 +1,21 @@
 <div>
 
 	<input id="uploaded-files-{property}" type="hidden"
-	       name="tx_mediaupload_pi1[uploadedFiles][{property}]" value="{uploadedFileList}"/>
+	       name="tx_mediaupload_upload[uploadedFiles][{property}]" value="{uploadedFileList}"/>
 
 	<div id="jquery-wrapped-fine-uploader-{widgetIdentifier}"></div>
 
 	<script type="text/template" id="media-upload-template-{uniqueId}">
 		<div class="qq-uploader-selector qq-uploader">
 			<div class="qq-upload-drop-area-selector qq-upload-drop-area" qq-hide-dropzone>
-				<span>{f:translate(key: 'fineUploader.dropFilesHere')}</span>
+				<span>{f:translate(extensionName: 'media_upload', key: 'fineUploader.dropFilesHere')}</span>
 			</div>
 			<div class="qq-upload-button-selector qq-upload-button">
-				<div>{f:translate(key: 'fineUploader.uploadFile')}</div>
+				<div>{f:translate(extensionName: 'media_upload', key: 'fineUploader.uploadFile')}</div>
 			</div>
-			(max {maximumSizeLabel} {f:translate(key: sizeUnit)})
+			(max {maximumSizeLabel} {f:translate(extensionName: 'media_upload', key: sizeUnit)})
               <span class="qq-drop-processing-selector qq-drop-processing">
-                  <span>{f:translate(key: 'fineUploader.processingDropFiles')}</span>
+                  <span>{f:translate(extensionName: 'media_upload', key: 'fineUploader.processingDropFiles')}</span>
                   <span class="qq-drop-processing-spinner-selector qq-drop-processing-spinner"></span>
               </span>
 			<ul id="qq-upload-list-{uniqueId}" class="qq-upload-list-selector qq-upload-list">
@@ -29,13 +29,13 @@
 					<span class="qq-upload-file-selector qq-upload-file"></span>
 					<input class="qq-edit-filename-selector qq-edit-filename" tabindex="0" type="text">
 					<span class="qq-upload-size-selector qq-upload-size"></span>
-					<a class="qq-upload-cancel-selector btn btn-small btn-warning" href="#">{f:translate(key: 'fineUploader.cancel')}</a>
-					<a class="qq-upload-retry-selector btn btn-small btn-info" href="#">{f:translate(key: 'fineUploader.retry')}</a>
-					<a class="qq-upload-delete-selector btn btn-small btn-warning" href="#">{f:translate(key: 'fineUploader.delete')}</a>
-					<a class="qq-upload-pause-selector btn btn-small btn-info" href="#">{f:translate(key: 'fineUploader.pause')}</a>
-					<a class="qq-upload-continue-selector btn btn-small btn-info" href="#">{f:translate(key: 'fineUploader.continue')}</a>
+					<a class="qq-upload-cancel-selector btn btn-small btn-warning" href="#">{f:translate(extensionName: 'media_upload', key: 'fineUploader.cancel')}</a>
+					<a class="qq-upload-retry-selector btn btn-small btn-info" href="#">{f:translate(extensionName: 'media_upload', key: 'fineUploader.retry')}</a>
+					<a class="qq-upload-delete-selector btn btn-small btn-warning" href="#">{f:translate(extensionName: 'media_upload', key: 'fineUploader.delete')}</a>
+					<a class="qq-upload-pause-selector btn btn-small btn-info" href="#">{f:translate(extensionName: 'media_upload', key: 'fineUploader.pause')}</a>
+					<a class="qq-upload-continue-selector btn btn-small btn-info" href="#">{f:translate(extensionName: 'media_upload', key: 'fineUploader.continue')}</a>
 					<span class="qq-upload-status-text-selector qq-upload-status-text"></span>
-					<a class="view-btn btn btn-small btn-info hide" target="_blank">{f:translate(key: 'fineUploader.view')}</a>
+					<a class="view-btn btn btn-small btn-info hide" target="_blank">{f:translate(extensionName: 'media_upload', key: 'fineUploader.view')}</a>
 				</li>
 			</ul>
 		</div>
@@ -52,19 +52,20 @@
 		var property= '{property}';
 		var allowedExtensions= ['<f:format.raw>{allowedExtensions}</f:format.raw>'];
 
-		var typeError = "{f:translate(key: 'fineUploader.message.errorType')}";
-		var sizeError = "{f:translate(key: 'fineUploader.message.sizeError')}";
-		var minSizeError = "{f:translate(key: 'fineUploader.message.minSizeError')}";
-		var emptyError = "{f:translate(key: 'fineUploader.message.emptyError')}";
-		var noFilesError = "{f:translate(key: 'fineUploader.message.noFilesError')}";
-		var tooManyItemsError = "{f:translate(key: 'fineUploader.message.tooManyItemsError')}";
-		var maxHeightImageError = "{f:translate(key: 'fineUploader.message.maxHeightImageError')}";
-		var maxWidthImageError = "{f:translate(key: 'fineUploader.message.maxWidthImageError')}";
-		var minHeightImageError = "{f:translate(key: 'fineUploader.message.minHeightImageError')}";
-		var minWidthImageError = "{f:translate(key: 'fineUploader.message.minWidthImageError')}";
-		var retryFailTooManyItems = "{f:translate(key: 'fineUploader.message.retryFailTooManyItems')}";
-		var onLeave = "{f:translate(key: 'fineUploader.message.onLeave')}";
-		var unsupportedBrowserIos8Safari = "{f:translate(key: 'fineUploader.message.unsupportedBrowserIos8Safari')}";
+		console.log(maximumSize)
+		var typeError = "{f:translate(extensionName: 'media_upload', key: 'fineUploader.message.errorType')}";
+		var sizeError = "{f:translate(extensionName: 'media_upload', key: 'fineUploader.message.sizeError')}";
+		var minSizeError = "{f:translate(extensionName: 'media_upload', key: 'fineUploader.message.minSizeError')}";
+		var emptyError = "{f:translate(extensionName: 'media_upload', key: 'fineUploader.message.emptyError')}";
+		var noFilesError = "{f:translate(extensionName: 'media_upload', key: 'fineUploader.message.noFilesError')}";
+		var tooManyItemsError = "{f:translate(extensionName: 'media_upload', key: 'fineUploader.message.tooManyItemsError')}";
+		var maxHeightImageError = "{f:translate(extensionName: 'media_upload', key: 'fineUploader.message.maxHeightImageError')}";
+		var maxWidthImageError = "{f:translate(extensionName: 'media_upload', key: 'fineUploader.message.maxWidthImageError')}";
+		var minHeightImageError = "{f:translate(extensionName: 'media_upload', key: 'fineUploader.message.minHeightImageError')}";
+		var minWidthImageError = "{f:translate(extensionName: 'media_upload', key: 'fineUploader.message.minWidthImageError')}";
+		var retryFailTooManyItems = "{f:translate(extensionName: 'media_upload', key: 'fineUploader.message.retryFailTooManyItems')}";
+		var onLeave = "{f:translate(extensionName: 'media_upload', key: 'fineUploader.message.onLeave')}";
+		var unsupportedBrowserIos8Safari = "{f:translate(extensionName: 'media_upload', key: 'fineUploader.message.unsupportedBrowserIos8Safari')}";
 
 	</script>
 

diff --git a/Resources/Public/Build/media_upload.js b/Resources/Public/Build/media_upload.js
@@ -10,7 +10,7 @@
 * Repository: git://github.com/FineUploader/fine-uploader.git
 *
 * Licensed only under the MIT license (http://fineuploader.com/licensing).
-*/ 
+*/
 
 
 (function(global) {
@@ -10732,9 +10732,9 @@ qq.extend(qq.Scaler.prototype, {
 
 qq.ExifRestorer = (function()
 {
-   
+
 	var ExifRestorer = {};
-	 
+
     ExifRestorer.KEY_STR = "ABCDEFGHIJKLMNOP" +
                          "QRSTUVWXYZabcdef" +
                          "ghijklmnopqrstuv" +
@@ -10775,23 +10775,23 @@ qq.ExifRestorer = (function()
 
         return output;
     };
-    
+
     ExifRestorer.restore = function(origFileBase64, resizedFileBase64)
     {
         var expectedBase64Header = "data:image/jpeg;base64,";
 
         if (!origFileBase64.match(expectedBase64Header))
         {
         	return resizedFileBase64;
-        }       
-        
+        }
+
         var rawImage = this.decode64(origFileBase64.replace(expectedBase64Header, ""));
         var segments = this.slice2Segments(rawImage);
-                
+
         var image = this.exifManipulation(resizedFileBase64, segments);
-        
+
         return expectedBase64Header + this.encode64(image);
-        
+
     };
 
 
@@ -10835,7 +10835,7 @@ qq.ExifRestorer = (function()
     };
 
 
-    
+
     ExifRestorer.slice2Segments = function(rawImageArray)
     {
         var head = 0,
@@ -10863,8 +10863,8 @@ qq.ExifRestorer = (function()
     };
 
 
-    
-    ExifRestorer.decode64 = function(input) 
+
+    ExifRestorer.decode64 = function(input)
     {
         var output = "",
             chr1, chr2, chr3 = "",
@@ -10907,7 +10907,7 @@ qq.ExifRestorer = (function()
         return buf;
     };
 
-    
+
     return ExifRestorer;
 })();
 
@@ -11791,7 +11791,7 @@ else {
 					})
 					.on('submit', {_settings: settings}, function(event) {
 						var params = {};
-						var parameterPrefix = 'tx_mediaupload_pi1';
+						var parameterPrefix = 'tx_mediaupload_upload';
 						params[parameterPrefix + '[storageIdentifier]'] = event.data._settings.storage;
 						params['type'] = '1386871773';
 						$(this).fineUploader('setParams', params);

diff --git a/Resources/Public/Build/media_upload.min.js b/Resources/Public/Build/media_upload.min.js