Mount options for ext storage are now passed around

The mount options are now passed to the UI and stored in a hidden field.
The ext storage controllers and services also know how to load/save them
from the legacy config.

2 files changed, 14 insertions, 2 deletions

diff --git a/apps/files_external/controller/globalstoragescontroller.php b/apps/files_external/controller/globalstoragescontroller.php
index 3aa64f0d85d..e5aff4f95a2 100644
--- a/apps/files_external/controller/globalstoragescontroller.php
+++ b/apps/files_external/controller/globalstoragescontroller.php
@@ -49,6 +49,7 @@ class GlobalStoragesController extends StoragesController {
 	 * @param string $mountPoint storage mount point
 	 * @param string $backendClass backend class name
 	 * @param array $backendOptions backend-specific options
+	 * @param array $mountOptions mount-specific options
 	 * @param array $applicableUsers users for which to mount the storage
 	 * @param array $applicableGroups groups for which to mount the storage
 	 * @param int $priority priority
@@ -59,6 +60,7 @@ class GlobalStoragesController extends StoragesController {
 		$mountPoint,
 		$backendClass,
 		$backendOptions,
+		$mountOptions,
 		$applicableUsers,
 		$applicableGroups,
 		$priority
@@ -67,6 +69,7 @@ class GlobalStoragesController extends StoragesController {
 		$newStorage->setMountPoint($mountPoint);
 		$newStorage->setBackendClass($backendClass);
 		$newStorage->setBackendOptions($backendOptions);
+		$newStorage->setMountOptions($mountOptions);
 		$newStorage->setApplicableUsers($applicableUsers);
 		$newStorage->setApplicableGroups($applicableGroups);
 		$newStorage->setPriority($priority);
@@ -93,6 +96,7 @@ class GlobalStoragesController extends StoragesController {
 	 * @param string $mountPoint storage mount point
 	 * @param string $backendClass backend class name
 	 * @param array $backendOptions backend-specific options
+	 * @param array $mountOptions mount-specific options
 	 * @param array $applicableUsers users for which to mount the storage
 	 * @param array $applicableGroups groups for which to mount the storage
 	 * @param int $priority priority
@@ -104,6 +108,7 @@ class GlobalStoragesController extends StoragesController {
 		$mountPoint,
 		$backendClass,
 		$backendOptions,
+		$mountOptions,
 		$applicableUsers,
 		$applicableGroups,
 		$priority
@@ -112,6 +117,7 @@ class GlobalStoragesController extends StoragesController {
 		$storage->setMountPoint($mountPoint);
 		$storage->setBackendClass($backendClass);
 		$storage->setBackendOptions($backendOptions);
+		$storage->setMountOptions($mountOptions);
 		$storage->setApplicableUsers($applicableUsers);
 		$storage->setApplicableGroups($applicableGroups);
 		$storage->setPriority($priority);
diff --git a/apps/files_external/controller/userstoragescontroller.php b/apps/files_external/controller/userstoragescontroller.php
index b77cbca59fd..64202b5e542 100644
--- a/apps/files_external/controller/userstoragescontroller.php
+++ b/apps/files_external/controller/userstoragescontroller.php
@@ -86,6 +86,7 @@ class UserStoragesController extends StoragesController {
 	 * @param string $mountPoint storage mount point
 	 * @param string $backendClass backend class name
 	 * @param array $backendOptions backend-specific options
+	 * @param array $mountOptions backend-specific mount options
 	 *
 	 * @return DataResponse
 	 *
@@ -94,12 +95,14 @@ class UserStoragesController extends StoragesController {
 	public function create(
 		$mountPoint,
 		$backendClass,
-		$backendOptions
+		$backendOptions,
+		$mountOptions
 	) {
 		$newStorage = new StorageConfig();
 		$newStorage->setMountPoint($mountPoint);
 		$newStorage->setBackendClass($backendClass);
 		$newStorage->setBackendOptions($backendOptions);
+		$newStorage->setMountOptions($mountOptions);
 
 		$response = $this->validate($newStorage);
 		if (!empty($response)) {
@@ -122,6 +125,7 @@ class UserStoragesController extends StoragesController {
 	 * @param string $mountPoint storage mount point
 	 * @param string $backendClass backend class name
 	 * @param array $backendOptions backend-specific options
+	 * @param array $mountOptions backend-specific mount options
 	 *
 	 * @return DataResponse
 	 */
@@ -129,12 +133,14 @@ class UserStoragesController extends StoragesController {
 		$id,
 		$mountPoint,
 		$backendClass,
-		$backendOptions
+		$backendOptions,
+		$mountOptions
 	) {
 		$storage = new StorageConfig($id);
 		$storage->setMountPoint($mountPoint);
 		$storage->setBackendClass($backendClass);
 		$storage->setBackendOptions($backendOptions);
+		$storage->setMountOptions($mountOptions);
 
 		$response = $this->validate($storage);
 		if (!empty($response)) {