Merge pull request #25 from jweiland-net/preventUploadOnFormError

Prevent upload on form error

Author: hojalatheef

.gitattributes

@@ -1,6 +1,7 @@
 /.github/ export-ignore
 /Build/ export-ignore
 /Tests/ export-ignore
+/.crowdin.yml export-ignore
 /.editorconfig export-ignore
 /.gitattributes export-ignore
 /.gitignore export-ignore

.github/workflows/ci.yml

@@ -6,28 +6,17 @@ on: [pull_request]
 jobs:
   coding:
     name: Coding Standard
-    runs-on: 'ubuntu-18.04'
+    runs-on: 'ubuntu-22.04'
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup PHP with tools
         uses: shivammathur/setup-php@v2
         with:
           php-version: '7.4'
 
-      - name: Get composer cache directory
-        id: composer-cache
-        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
-
-      - name: Cache composer dependencies
-        uses: actions/cache@v2
-        with:
-          path: ${{ steps.composer-cache.outputs.dir }}
-          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
-          restore-keys: ${{ runner.os }}-composer-
-
       - name: Validate composer.json and composer.lock
         run: composer validate
 
@@ -44,7 +33,7 @@ jobs:
         run: composer ci:php:lint
 
   testing:
-    runs-on: 'ubuntu-18.04'
+    runs-on: 'ubuntu-22.04'
     name: PHP Unit and Functional Tests
     needs: coding
 
@@ -62,7 +51,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Start MySQL Server at GitHub
         if: ${{ env.GITHUB_ACTOR != 'nektos/act' }}
@@ -76,17 +65,6 @@ jobs:
           ini-values: memory_limit=512M, post_max_size=48M, max_execution_time=30
           coverage: none
 
-      - name: Get composer cache directory
-        id: composer-cache
-        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
-
-      - name: Cache composer dependencies
-        uses: actions/cache@v2
-        with:
-          path: ${{ steps.composer-cache.outputs.dir }}
-          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
-          restore-keys: ${{ runner.os }}-composer-
-
       - name: Install dependencies with typo3/cms-core:${{ matrix.typo3 }}
         run: |
           composer require typo3/cms-core:${{ matrix.typo3 }} --no-progress

.gitignore

@@ -10,6 +10,7 @@
 *~
 *.bak
 *.swp
+.ddev
 .DS_Store
 
 # Ignore by common IDEs used directories/files
@@ -31,4 +32,4 @@ nbproject
 *.log
 
 # Ignore composer stuff
-/composer.lock
+/composer.lock

Classes/Configuration/ExtConf.php

@@ -11,6 +11,9 @@
 
 namespace JWeiland\Checkfaluploads\Configuration;
 
+use JWeiland\Checkfaluploads\Traits\ApplicationContextTrait;
+use TYPO3\CMS\Core\Configuration\Exception\ExtensionConfigurationExtensionNotConfiguredException;
+use TYPO3\CMS\Core\Configuration\Exception\ExtensionConfigurationPathDoesNotExistException;
 use TYPO3\CMS\Core\Configuration\ExtensionConfiguration;
 use TYPO3\CMS\Core\SingletonInterface;
 use TYPO3\CMS\Extbase\Utility\LocalizationUtility;
@@ -20,23 +23,26 @@
  */
 class ExtConf implements SingletonInterface
 {
+    use ApplicationContextTrait;
+
     /**
      * @var string
      */
     protected $owner = '';
 
     public function __construct(ExtensionConfiguration $extensionConfiguration)
     {
-        // get global configuration
-        $extConf = $extensionConfiguration->get('checkfaluploads');
-        if (is_array($extConf)) {
-            // call setter method foreach configuration entry
-            foreach ($extConf as $key => $value) {
-                $methodName = 'set' . ucfirst($key);
-                if (method_exists($this, $methodName)) {
-                    $this->$methodName($value);
+        try {
+            $extConf = $extensionConfiguration->get('checkfaluploads');
+            if (is_array($extConf)) {
+                foreach ($extConf as $key => $value) {
+                    $methodName = 'set' . ucfirst($key);
+                    if (method_exists($this, $methodName)) {
+                        $this->$methodName($value);
+                    }
                 }
             }
+        } catch (ExtensionConfigurationExtensionNotConfiguredException | ExtensionConfigurationPathDoesNotExistException $e) {
         }
     }
 
@@ -60,11 +66,16 @@ public function setOwner(string $owner): void
      */
     public function getLabelForUserRights(): string
     {
+        $langKey = 'dragUploader.fileRights.title';
+        if ($this->isFrontendRequest()) {
+            $langKey = 'frontend.imageUserRights';
+        }
+
         return LocalizationUtility::translate(
-            'dragUploader.fileRights.title',
+            $langKey,
             'checkfaluploads',
             [
-                0 => $this->getOwner()
+                0 => $this->getOwner(),
             ]
         );
     }

Classes/EventListener/AddUserToFalRecordOnCreationEventListener.php

@@ -11,16 +11,21 @@
 
 namespace JWeiland\Checkfaluploads\EventListener;
 
-use TYPO3\CMS\Core\Authentication\BackendUserAuthentication;
+use JWeiland\Checkfaluploads\Traits\ApplicationContextTrait;
+use JWeiland\Checkfaluploads\Traits\BackendUserAuthenticationTrait;
+use JWeiland\Checkfaluploads\Traits\TypoScriptFrontendControllerTrait;
 use TYPO3\CMS\Core\Database\ConnectionPool;
 use TYPO3\CMS\Core\Resource\Event\AfterFileAddedToIndexEvent;
-use TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController;
 
 /**
  * Add the uid of the current user to the uploaded file
  */
 class AddUserToFalRecordOnCreationEventListener
 {
+    use ApplicationContextTrait;
+    use BackendUserAuthenticationTrait;
+    use TypoScriptFrontendControllerTrait;
+
     /**
      * @var ConnectionPool
      */
@@ -39,9 +44,9 @@ public function __invoke(AfterFileAddedToIndexEvent $event): void
         }
 
         $fields = [];
-        if (TYPO3_MODE === 'BE') {
+        if ($this->isBackendRequest()) {
             $fields['cruser_id'] = (int)($this->getBackendUserAuthentication()->user['uid'] ?? 0);
-        } elseif (TYPO3_MODE === 'FE') {
+        } elseif ($this->isFrontendRequest()) {
             $fields['fe_cruser_id'] = (int)($this->getTypoScriptFrontendController()->fe_user->user['uid'] ?? 0);
         }
 
@@ -54,14 +59,4 @@ public function __invoke(AfterFileAddedToIndexEvent $event): void
             ]
         );
     }
-
-    protected function getBackendUserAuthentication(): BackendUserAuthentication
-    {
-        return $GLOBALS['BE_USER'];
-    }
-
-    protected function getTypoScriptFrontendController(): TypoScriptFrontendController
-    {
-        return $GLOBALS['TSFE'];
-    }
 }

Classes/EventListener/AddUserToFalRecordOnUpdateEventListener.php

@@ -11,16 +11,21 @@
 
 namespace JWeiland\Checkfaluploads\EventListener;
 
-use TYPO3\CMS\Core\Authentication\BackendUserAuthentication;
+use JWeiland\Checkfaluploads\Traits\ApplicationContextTrait;
+use JWeiland\Checkfaluploads\Traits\BackendUserAuthenticationTrait;
+use JWeiland\Checkfaluploads\Traits\TypoScriptFrontendControllerTrait;
 use TYPO3\CMS\Core\Database\ConnectionPool;
 use TYPO3\CMS\Core\Resource\Event\AfterFileUpdatedInIndexEvent;
-use TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController;
 
 /**
  * Add the uid of the current user to the uploaded file
  */
 class AddUserToFalRecordOnUpdateEventListener
 {
+    use ApplicationContextTrait;
+    use BackendUserAuthenticationTrait;
+    use TypoScriptFrontendControllerTrait;
+
     /**
      * @var ConnectionPool
      */
@@ -39,9 +44,9 @@ public function __invoke(AfterFileUpdatedInIndexEvent $event): void
         }
 
         $fields = [];
-        if (TYPO3_MODE === 'BE') {
+        if ($this->isBackendRequest()) {
             $fields['cruser_id'] = (int)$this->getBackendUserAuthentication()->user['uid'];
-        } elseif (TYPO3_MODE === 'FE') {
+        } elseif ($this->isFrontendRequest()) {
             $fields['fe_cruser_id'] = (int)$this->getTypoScriptFrontendController()->fe_user->user['uid'];
         }
 
@@ -54,14 +59,4 @@ public function __invoke(AfterFileUpdatedInIndexEvent $event): void
             ]
         );
     }
-
-    protected function getBackendUserAuthentication(): BackendUserAuthentication
-    {
-        return $GLOBALS['BE_USER'];
-    }
-
-    protected function getTypoScriptFrontendController(): TypoScriptFrontendController
-    {
-        return $GLOBALS['TSFE'];
-    }
 }

Classes/EventListener/UserMarkedCheckboxForRightsEventListener.php

@@ -11,9 +11,9 @@
 
 namespace JWeiland\Checkfaluploads\EventListener;
 
+use JWeiland\Checkfaluploads\Helper\MessageHelper;
+use JWeiland\Checkfaluploads\Traits\ApplicationContextTrait;
 use TYPO3\CMS\Core\Messaging\AbstractMessage;
-use TYPO3\CMS\Core\Messaging\FlashMessage;
-use TYPO3\CMS\Core\Messaging\FlashMessageService;
 use TYPO3\CMS\Core\Resource\Event\BeforeFileAddedEvent;
 use TYPO3\CMS\Core\Resource\Event\BeforeFileReplacedEvent;
 use TYPO3\CMS\Core\Resource\Exception\InsufficientUserPermissionsException;
@@ -26,14 +26,24 @@
  */
 class UserMarkedCheckboxForRightsEventListener
 {
+    use ApplicationContextTrait;
+
     /**
      * @var ExtendedFileUtility
      */
     protected $extendedFileUtility;
 
-    public function __construct(ExtendedFileUtility $extendedFileUtility)
-    {
+    /**
+     * @var MessageHelper
+     */
+    protected $messageHelper;
+
+    public function __construct(
+        ExtendedFileUtility $extendedFileUtility,
+        MessageHelper $messageHelper
+    ) {
         $this->extendedFileUtility = $extendedFileUtility;
+        $this->messageHelper = $messageHelper;
     }
 
     /**
@@ -42,9 +52,9 @@ public function __construct(ExtendedFileUtility $extendedFileUtility)
     public function checkForAddedFile(BeforeFileAddedEvent $event): void
     {
         // FE will not be checked here. This should be part of the extension itself.
-        if (TYPO3_MODE === 'BE') {
+        if ($this->isBackendRequest()) {
             $fileParts = GeneralUtility::split_fileref($event->getFileName());
-            if (!in_array($fileParts['fileext'], ['youtube', 'vimeo'])) {
+            if (!in_array($fileParts['fileext'], ['youtube', 'vimeo'], true)) {
                 $userHasRights = GeneralUtility::_POST('userHasRights');
                 if (empty($userHasRights)) {
                     $message = LocalizationUtility::translate(
@@ -54,7 +64,7 @@ public function checkForAddedFile(BeforeFileAddedEvent $event): void
 
                     $this->extendedFileUtility->writeLog(1, 1, 105, $message, []);
 
-                    $this->addMessageToFlashMessageQueue($message);
+                    $this->messageHelper->addFlashMessage($message, '', AbstractMessage::ERROR);
 
                     throw new InsufficientUserPermissionsException($message, 1396626278);
                 }
@@ -68,7 +78,7 @@ public function checkForAddedFile(BeforeFileAddedEvent $event): void
     public function checkForReplacedFile(BeforeFileReplacedEvent $event): void
     {
         // FE will not be checked here. This should be part of the extension itself.
-        if (TYPO3_MODE === 'BE') {
+        if ($this->isBackendRequest()) {
             $fileParts = GeneralUtility::split_fileref($event->getFile()->getName());
             if (!in_array($fileParts['fileext'], ['youtube', 'vimeo'])) {
                 $userHasRights = GeneralUtility::_POST('userHasRights');
@@ -80,36 +90,11 @@ public function checkForReplacedFile(BeforeFileReplacedEvent $event): void
 
                     $this->extendedFileUtility->writeLog(1, 1, 105, $message, []);
 
-                    $this->addMessageToFlashMessageQueue($message);
+                    $this->messageHelper->addFlashMessage($message, '', AbstractMessage::ERROR);
 
                     throw new InsufficientUserPermissionsException($message, 1396626278);
                 }
             }
         }
     }
-
-    protected function addMessageToFlashMessageQueue(
-        string $message,
-        int $severity = AbstractMessage::ERROR
-    ): void {
-        if (TYPO3_MODE !== 'BE') {
-            return;
-        }
-
-        $flashMessage = GeneralUtility::makeInstance(
-            FlashMessage::class,
-            $message,
-            '',
-            $severity,
-            true
-        );
-        $this->addFlashMessage($flashMessage);
-    }
-
-    protected function addFlashMessage(FlashMessage $flashMessage): void
-    {
-        $flashMessageService = GeneralUtility::makeInstance(FlashMessageService::class);
-        $defaultFlashMessageQueue = $flashMessageService->getMessageQueueByIdentifier();
-        $defaultFlashMessageQueue->enqueue($flashMessage);
-    }
 }