From edfeb05a05284549b3d6df574bf0dcc1c4adec1c Mon Sep 17 00:00:00 2001
From: Robin McCorkell <rmccorkell@karoshi.org.uk>
Date: Tue, 24 Feb 2015 23:06:47 +0000
Subject: Fix bugs in ownCloud external storage

---
 apps/files_external/lib/owncloud.php            | 4 ++--
 apps/files_external/tests/owncloudfunctions.php | 8 ++++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

(limited to 'apps/files_external')

diff --git a/apps/files_external/lib/owncloud.php b/apps/files_external/lib/owncloud.php
index e9824140c7a..d00da691cd9 100644
--- a/apps/files_external/lib/owncloud.php
+++ b/apps/files_external/lib/owncloud.php
@@ -49,13 +49,13 @@ class OwnCloud extends \OC\Files\Storage\DAV{
 			$host = substr($host, 0, $hostSlashPos);
 		}
 
-		if (substr($contextPath , 1) !== '/'){
+		if (substr($contextPath, -1) !== '/'){
 			$contextPath .= '/';
 		}
 
 		if (isset($params['root'])){
 			$root = $params['root'];
-			if (substr($root, 1) !== '/'){
+			if (substr($root, 0, 1) !== '/'){
 				$root = '/' . $root;
 			}
 		}
diff --git a/apps/files_external/tests/owncloudfunctions.php b/apps/files_external/tests/owncloudfunctions.php
index de7bf3eff2b..0135c4618a3 100644
--- a/apps/files_external/tests/owncloudfunctions.php
+++ b/apps/files_external/tests/owncloudfunctions.php
@@ -81,6 +81,14 @@ class OwnCloudFunctions extends \Test\TestCase {
 				),
 				'http://testhost/testroot/remote.php/webdav/subdir/',
 			),
+			array(
+				array(
+					'host' => 'http://testhost/testroot/',
+					'root' => '/subdir',
+					'secure' => false
+				),
+				'http://testhost/testroot/remote.php/webdav/subdir/',
+			),
 		);
 	}
 
-- 
cgit v1.2.3