Merge pull request #133 from danut007ro/allow_directoryPerm_parameter

Allow setting the directoryPerm parameter
helios-ag · Apr 3, 2015 · 97b5da5 · 97b5da5
2 parents 5370a78 + 93d7309
commit 97b5da5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/Configuration/ElFinderConfigurationReader.php b/Configuration/ElFinderConfigurationReader.php
@@ -172,11 +172,12 @@ private function configureFlysystem($opt, $adapter)
                     'password' => $opt['ftp']['password'],
 
                     /** optional config settings */
-                    'port'     => $opt['ftp']['port'],
-                    'root'     => $opt['ftp']['root'],
-                    'passive'  => $opt['ftp']['passive'],
-                    'ssl'      => $opt['ftp']['ssl'],
-                    'timeout'  => $opt['ftp']['timeout']
+                    'port'          => $opt['ftp']['port'],
+                    'root'          => $opt['ftp']['root'],
+                    'passive'       => $opt['ftp']['passive'],
+                    'ssl'           => $opt['ftp']['ssl'],
+                    'timeout'       => $opt['ftp']['timeout'],
+                    'directoryPerm' => $opt['ftp']['directoryPerm']
                 );
                 $filesystem = (!$opt['ftp']['sftp']) ? new Filesystem(new Ftp($settings)): new Filesystem(new SftpAdapter($settings));
                 break;

diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
@@ -239,6 +239,7 @@ private function createFlysystemNode()
                             ->booleanNode('ssl')->defaultTrue()->end()
                             ->integerNode('timeout')->defaultValue(30)->end()
                             ->scalarNode('root')->defaultValue('/')->end()
+                            ->integerNode('directoryPerm')->defaultValue(0744)->end()
                     ->end()
                 ->end()
                 ->arrayNode('aws_s3_v2')