Merge remote-tracking branch 'upstream/8.x-1.x' into 2671914_conf_ui

Author: primsi

dropzonejs.services.yml

@@ -1,7 +1,7 @@
 services:
   dropzonejs.upload_save:
     class: Drupal\dropzonejs\DropzoneJsUploadSave
-    arguments: ['@entity.manager', '@file.mime_type.guesser', '@file_system', '@logger.factory', '@renderer', '@config.factory']
+    arguments: ['@entity.manager', '@file.mime_type.guesser', '@file_system', '@logger.factory', '@renderer', '@config.factory', '@token']
   dropzonejs.upload_handler:
     class: Drupal\dropzonejs\UploadHandler
     arguments: ['@request_stack', '@config.factory', '@transliteration']

js/dropzone.integration.js

@@ -12,7 +12,7 @@
   Drupal.dropzonejsInstances = [];
 
   Drupal.behaviors.dropzonejsIntegraion = {
-    attach: function(context) {
+    attach: function (context) {
       Dropzone.autoDiscover = false;
       var selector = $(".dropzone-enable");
       selector.addClass("dropzone");
@@ -30,9 +30,9 @@
       drupalSettings["dropzonejs"]["instances"][selector.attr("id")]["instance"] = dropzoneInstance;
 
       // React on add file. Add only accepted files.
-      dropzoneInstance.on("success", function(file, response) {
+      dropzoneInstance.on("success", function (file, response) {
         var uploadedFilesElement = selector.siblings(':hidden');
-        var currentValue = uploadedFilesElement.attr('value');
+        var currentValue = uploadedFilesElement.attr('value') || '';
 
         // The file is transliterated on upload. The element has to reflect
         // the real filename.
@@ -42,15 +42,15 @@
       });
 
       // React on file removing.
-      dropzoneInstance.on("removedfile", function(file) {
+      dropzoneInstance.on("removedfile", function (file) {
         var uploadedFilesElement = selector.siblings(':hidden');
         var currentValue = uploadedFilesElement.attr('value');
 
         // Remove the file from the element.
         if (currentValue.length) {
           var fileNames = currentValue.split(";");
           for (var i in fileNames) {
-            if (fileNames[i] == file.processedName) {
+            if (fileNames[i] === file.processedName) {
               fileNames.splice(i,1);
               break;
             }

modules/eb_widget/src/Plugin/EntityBrowser/Widget/DropzoneJsEbWidget.php

@@ -83,7 +83,7 @@ public static function create(ContainerInterface $container, array $configuratio
    */
   public function defaultConfiguration() {
     return [
-      'upload_location' => 'public://',
+      'upload_location' => 'public://[date:custom:Y]-[date:custom:m]',
       'dropzone_description' => t('Drop files here to upload them'),
       'max_filesize' => file_upload_max_size() / pow(Bytes::KILOBYTE, 2) . 'M',
       'extensions' => 'jpg jpeg gif png txt doc xls pdf ppt pps odt ods odp',

src/DropzoneJsUploadSave.php

@@ -7,11 +7,13 @@
 
 namespace Drupal\dropzonejs;
 
+use Drupal\Component\Render\PlainTextOutput;
 use Drupal\Core\Config\ConfigFactoryInterface;
 use Drupal\Core\Entity\EntityManagerInterface;
 use Drupal\Core\Logger\LoggerChannelFactoryInterface;
 use Drupal\Core\Render\RendererInterface;
 use Drupal\Core\Session\AccountProxyInterface;
+use Drupal\Core\Utility\Token;
 use Drupal\file\FileInterface;
 use Symfony\Component\HttpFoundation\File\MimeType\MimeTypeGuesserInterface;
 use Symfony\Component\Validator\Constraints\File;
@@ -68,6 +70,13 @@ class DropzoneJsUploadSave implements DropzoneJsUploadSaveInterface {
    */
   protected $configFactory;
 
+  /**
+   * The token service.
+   *
+   * @var \Drupal\Core\Utility\Token
+   */
+  protected $token;
+
   /**
    * Construct the DropzoneUploadSave object.
    *
@@ -83,14 +92,17 @@ class DropzoneJsUploadSave implements DropzoneJsUploadSaveInterface {
    *   The renderer service.
    * @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory
    *   Config factory service.
+   * @param \Drupal\Core\Utility\Token $token
+   *   The token service.
    */
-  public function __construct(EntityManagerInterface $entity_manager, MimeTypeGuesserInterface $mimetype_guesser, FileSystemInterface $file_system, LoggerChannelFactoryInterface $logger_factory, RendererInterface $renderer, ConfigFactoryInterface $config_factory) {
+  public function __construct(EntityManagerInterface $entity_manager, MimeTypeGuesserInterface $mimetype_guesser, FileSystemInterface $file_system, LoggerChannelFactoryInterface $logger_factory, RendererInterface $renderer, ConfigFactoryInterface $config_factory, Token $token) {
     $this->entityManager = $entity_manager;
     $this->mimeTypeGuesser = $mimetype_guesser;
     $this->fileSystem = $file_system;
     $this->logger = $logger_factory->get('dropzonejs');
     $this->renderer = $renderer;
     $this->configFactory = $config_factory;
+    $this->token = $token;
   }
 
   /**
@@ -100,6 +112,10 @@ public function saveFile($uri, $destination, $extensions, AccountProxyInterface
     // Create the file entity.
     $file = $this->fileEntityFromUri($uri, $user);
 
+    // Replace tokens. As the tokens might contain HTML we convert it to plain
+    // text.
+    $destination = PlainTextOutput::renderFromHtml($this->token->replace($destination));
+
     // Handle potentialy dangerous extensions.
     $renamed = $this->renameExecutableExtensions($file);
     // The .txt extension may not be in the allowed list of extensions. We have
@@ -226,7 +242,7 @@ protected function prepareDestination(FileInterface $file, $destination) {
 
     // Prepare the destination dir.
     if (!file_exists($destination)) {
-      $this->fileSystem->mkdir($destination);
+      $this->fileSystem->mkdir($destination, NULL, TRUE);
     }
 
     // A file URI may already have a trailing slash or look like "public://".