[BUGFIX] Remove edit buttons if public

calien666 · Feb 15, 2024 · 0e319e1 · 0e319e1
1 parent 45860f2
commit 0e319e1
Show file tree

Hide file tree

Showing 8 changed files with 59 additions and 9 deletions.
diff --git a/Classes/ContextMenu/V11/ItemProvider.php b/Classes/ContextMenu/V11/ItemProvider.php
@@ -25,7 +25,7 @@ final class ItemProvider extends AbstractProvider
 {
     protected ResourceFactory $resourceFactory;
 
-    protected Folder $folder;
+    protected ?Folder $folder = null;
 
     /**
      * @var array<string, mixed>
@@ -71,6 +71,19 @@ public function canHandle(): bool
         return $this->table === 'sys_file' || $this->table === 'sys_file_storage';
     }
 
+    /**
+     * @throws ResourceDoesNotExistException
+     */
+    public function addItems(array $items): array
+    {
+        $this->initialize();
+        if (!$this->folder instanceof Folder) {
+            return $items;
+        }
+        $items += $this->prepareItems($this->itemsConfiguration);
+        return $items;
+    }
+
     /**
      * @throws ResourceDoesNotExistException
      */

diff --git a/Classes/Domain/Model/Folder.php b/Classes/Domain/Model/Folder.php
@@ -33,7 +33,7 @@ public function __construct(
         $this->folder = $folder;
         $this->folderHash = $folderHash;
         $this->storage = $storage;
-        $this->feGroups = !empty($feGroups) ? GeneralUtility::intExplode(',', $feGroups) : [];
+        $this->feGroups = !empty($feGroups) ? GeneralUtility::intExplode(',', $feGroups, true) : [];
     }
 
     public function getUid(): int

diff --git a/Classes/EventListener/EditAccessRightsButton.php b/Classes/EventListener/EditAccessRightsButton.php
@@ -22,6 +22,22 @@ final class EditAccessRightsButton
 {
     private static string $filePattern = '/(\d)(:)(.*)/';
 
+    private IconFactory $iconFactory;
+
+    private UriBuilder $uriBuilder;
+
+    private FolderRepository $folderRepository;
+
+    public function __construct(
+        UriBuilder $uriBuilder,
+        FolderRepository $folderRepository,
+        IconFactory $iconFactory
+    ) {
+        $this->uriBuilder = $uriBuilder;
+        $this->folderRepository = $folderRepository;
+        $this->iconFactory = $iconFactory;
+    }
+
     public function __invoke(ModifyButtonBarEvent $event): void
     {
         /** @var ServerRequestInterface $request */
@@ -36,7 +52,7 @@ public function __invoke(ModifyButtonBarEvent $event): void
         $storageId = (int)$matches[1];
         $path = $matches[3];
 
-        $folder = GeneralUtility::makeInstance(FolderRepository::class)
+        $folder = $this->folderRepository
             ->findByStorageAndPath($storageId, $path);
 
         if ($folder->getStorage()->isPublic()) {
@@ -45,11 +61,11 @@ public function __invoke(ModifyButtonBarEvent $event): void
 
         $editAccessRightsButton = $event->getButtonBar()->makeLinkButton()
             ->setIcon(
-                GeneralUtility::makeInstance(IconFactory::class)
+                $this->iconFactory
                     ->getIcon('actions-lock', Icon::SIZE_SMALL)
             )
             ->setHref(
-                (string)GeneralUtility::makeInstance(UriBuilder::class)
+                (string)$this->uriBuilder
                     ->buildUriFromRoute(
                         'record_edit',
                         [

diff --git a/Classes/Hooks/ButtonBarHook.php b/Classes/Hooks/ButtonBarHook.php
@@ -50,6 +50,10 @@ public function renderButtons(array $params, ButtonBar $buttonBar): array
         $folder = GeneralUtility::makeInstance(FolderRepository::class)
             ->findByStorageAndPath($storageId, $path);
 
+        if ($folder->getStorage()->isPublic()) {
+            return $buttons;
+        }
+
         $editButton = $buttonBar->makeLinkButton()
             ->setIcon(
                 GeneralUtility::makeInstance(IconFactory::class)

diff --git a/Configuration/TCA/Overrides/tx_securefilemount_folder.php b/Configuration/TCA/Overrides/tx_securefilemount_folder.php
@@ -0,0 +1,15 @@
+<?php
+
+declare(strict_types=1);
+
+
+(static function (): void {
+    /**
+     * @deprecated will be removed with removal of v11 support
+     * cruser_id is breaking removed in v12
+     * @see https://docs.typo3.org/c/typo3/cms-core/main/en-us/Changelog/12.0/Breaking-98024-TCA-option-cruserid-removed.html
+     */
+    if ((new \TYPO3\CMS\Core\Information\Typo3Version())->getMajorVersion() < 12) {
+        $GLOBALS['TCA']['tx_securefilemount_folder']['ctrl']['cruser_id'] = 'cruser_id';
+    }
+})();
diff --git a/composer.json b/composer.json
@@ -16,9 +16,11 @@
 		}
 	],
 	"require": {
-		"php": "^7.4 || ^8.0 || ^8.1 || ^8.2",
+		"php": "^7.4 || ^8.0 || ^8.1 || ^8.2 || ^8.3",
+		"typo3/cms-backend": "^11.5 || ^12.4",
 		"typo3/cms-core": "^11.5 || ^12.4",
-		"typo3/cms-filelist": "^11.5 || ^12.4"
+		"typo3/cms-filelist": "^11.5 || ^12.4",
+		"typo3/cms-frontend": "^11.5 || ^12.4"
 	},
 	"require-dev": {
 		"typo3/testing-framework": "^7.0",

diff --git a/ext_emconf.php b/ext_emconf.php
@@ -12,7 +12,7 @@
     'constraints' => [
         'depends' => [
             'typo3' => '11.5.0-12.4.99',
-            'php' => '7.4.0-8.2.99',
+            'php' => '7.4.0-8.3.99',
         ],
         'conflicts' => [
             'fal_securedownload' => '',

diff --git a/ext_localconf.php b/ext_localconf.php
@@ -7,7 +7,7 @@
             = \Calien\SecureFilemount\ContextMenu\V11\ItemProvider::class;
 
         // Will be removed when v11 support dropped
-        // @see @see https://docs.typo3.org/c/typo3/cms-core/main/en-us/Changelog/12.0/Breaking-96806-RemovedHookForModifyingButtonBar.html
+        // @see https://docs.typo3.org/c/typo3/cms-core/main/en-us/Changelog/12.0/Breaking-96806-RemovedHookForModifyingButtonBar.html
         $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['Backend\Template\Components\ButtonBar']['getButtonsHook'][1679002016878]
             = \Calien\SecureFilemount\Hooks\ButtonBarHook::class . '->renderButtons';
     }