Fix FileManager to use originals parameter instead of hard coded 'ori…

…ginals' Fixes punkave#25

Resources/config/services.yml

@@ -84,6 +84,7 @@ services:
         arguments:
           # For bc reasons we're not changing the names of the parameters
           - file_base_path: '%file_uploader.file_base_path%'
+            originals: '%file_uploader.originals%'
 
     punk_ave.twig.file_extension:
         class: PunkAve\FileUploaderBundle\Twig\FileExtension

Services/FileManager.php

@@ -12,18 +12,20 @@ public function __construct($options)
     }
 
     /**
-     * Get a list of files already present. The 'folder' option is required. 
+     * Get a list of files already present. The 'folder' option is required.
      * If you pass consistent options to this method and handleFileUpload with
      * regard to paths, then you will get consistent results.
      */
     public function getFiles($options = array())
     {
         $options = array_merge($this->options, $options);
 
+        $originals = $options['originals'];
+
         $folder = $options['file_base_path'] . '/' . $options['folder'];
         if (file_exists($folder))
         {
-            $dirs = glob("$folder/originals/*");
+            $dirs = glob($folder . '/' . $originals['folder'] . '/*');
             $fullPath = isset($options['full_path']) ? $options['full_path'] : false;
             if ($fullPath)
             {
@@ -68,11 +70,11 @@ public function removeFiles($options = array())
     /**
      * Sync existing files from one folder to another. The 'fromFolder' and 'toFolder'
      * options are required. As with the 'folder' option elsewhere, these are appended
-     * to the file_base_path for you, missing parent folders are created, etc. If 
+     * to the file_base_path for you, missing parent folders are created, etc. If
      * 'fromFolder' does not exist no error is reported as this is common if no files
      * have been uploaded. If there are files and the sync reports errors an exception
      * is thrown.
-     * 
+     *
      * If you pass consistent options to this method and handleFileUpload with
      * regard to paths, then you will get consistent results.
      */