support string values ('true' and 'false') for configuring the secure parameter on...

fixes #78

diff --git a/apps/files_external/lib/ftp.php b/apps/files_external/lib/ftp.php
index 2fc2a3a1a3714298cde7f7831151f052395c5f7f..650ca88fd932123a48ebae565a33348515a1a954 100644 (file)
--- a/apps/files_external/lib/ftp.php
+++ b/apps/files_external/lib/ftp.php
@@ -19,7 +19,15 @@ class OC_FileStorage_FTP extends OC_FileStorage_StreamWrapper{
                $this->host=$params['host'];
                $this->user=$params['user'];
                $this->password=$params['password'];
-               $this->secure=isset($params['secure'])?(bool)$params['secure']:false;
+               if(isset($params['secure'])){
+                       if(is_string($params['secure'])){
+                               $this->secure = ($params['secure'] === 'true');
+                       }else{
+                               $this->secure = (bool)$params['secure'];
+                       }
+               }else{
+                       $this->secure = false;
+               }
                $this->root=isset($params['root'])?$params['root']:'/';
                if(!$this->root || $this->root[0]!='/') {
                        $this->root='/'.$this->root;

diff --git a/apps/files_external/lib/swift.php b/apps/files_external/lib/swift.php
index 2f0076706e4b3b2ca055ca74522626629a949f25..9c9754ac34688c198c1da4eedb661d7f2cbf829b 100644 (file)
--- a/apps/files_external/lib/swift.php
+++ b/apps/files_external/lib/swift.php
@@ -271,7 +271,15 @@ class OC_FileStorage_SWIFT extends OC_Filestorage_Common{
                $this->host=$params['host'];
                $this->user=$params['user'];
                $this->root=isset($params['root'])?$params['root']:'/';
-               $this->secure=isset($params['secure'])?(bool)$params['secure']:true;
+               if(isset($params['secure'])){
+                       if(is_string($params['secure'])){
+                               $this->secure = ($params['secure'] === 'true');
+                       }else{
+                               $this->secure = (bool)$params['secure'];
+                       }
+               }else{
+                       $this->secure = false;
+               }
                if(!$this->root || $this->root[0]!='/') {
                        $this->root='/'.$this->root;
                }

diff --git a/apps/files_external/lib/webdav.php b/apps/files_external/lib/webdav.php
index 02fe540d061bf132f39c08cd0c324ab7b515e5aa..ec942b11f6a4874c89271958e92c78dfe2ace159 100644 (file)
--- a/apps/files_external/lib/webdav.php
+++ b/apps/files_external/lib/webdav.php
@@ -27,7 +27,15 @@ class OC_FileStorage_DAV extends OC_Filestorage_Common{
                $this->host=$host;
                $this->user=$params['user'];
                $this->password=$params['password'];
-               $this->secure=(isset($params['secure']) && $params['secure'] == 'true')?true:false;
+               if(isset($params['secure'])){
+                       if(is_string($params['secure'])){
+                               $this->secure = ($params['secure'] === 'true');
+                       }else{
+                               $this->secure = (bool)$params['secure'];
+                       }
+               }else{
+                       $this->secure = false;
+               }
                $this->root=isset($params['root'])?$params['root']:'/';
                if(!$this->root || $this->root[0]!='/') {
                        $this->root='/'.$this->root;

diff --git a/apps/files_external/tests/ftp.php b/apps/files_external/tests/ftp.php
index 4549c4204101903ffca58c24bc38706bb40a05ad..80288b591141a6697d1f283ab62af5ae1f3c7538 100644 (file)
--- a/apps/files_external/tests/ftp.php
+++ b/apps/files_external/tests/ftp.php
@@ -24,4 +24,22 @@ class Test_Filestorage_FTP extends Test_FileStorage {
                        OCP\Files::rmdirr($this->instance->constructUrl(''));
                }
        }
+
+       public function testConstructUrl(){
+               $config = array ( 'host' => 'localhost', 'user' => 'ftp', 'password' => 'ftp', 'root' => '/', 'secure' => false );
+               $instance = new OC_Filestorage_FTP($config);
+               $this->assertEqual('ftp://ftp:ftp@localhost/', $instance->constructUrl(''));
+
+               $config['secure'] = true;
+               $instance = new OC_Filestorage_FTP($config);
+               $this->assertEqual('ftps://ftp:ftp@localhost/', $instance->constructUrl(''));
+
+               $config['secure'] = 'false';
+               $instance = new OC_Filestorage_FTP($config);
+               $this->assertEqual('ftp://ftp:ftp@localhost/', $instance->constructUrl(''));
+
+               $config['secure'] = 'true';
+               $instance = new OC_Filestorage_FTP($config);
+               $this->assertEqual('ftps://ftp:ftp@localhost/', $instance->constructUrl(''));
+       }
 }