From 327bfcb2b59a9d3e2a99b8b2f41185629197da47 Mon Sep 17 00:00:00 2001 From: Gidi Kroon Date: Fri, 7 Jan 2022 02:14:24 +0100 Subject: [PATCH] Add name check for webdav configuration options The webdav_storage addon should check whether it should provide its config options and its instance based on the provided `$data['name']`. Not doing this will override the configuration and instance of another storage add-on. --- webdav_storage/webdav_storage.php | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/webdav_storage/webdav_storage.php b/webdav_storage/webdav_storage.php index 7686ca9f..a93caeff 100644 --- a/webdav_storage/webdav_storage.php +++ b/webdav_storage/webdav_storage.php @@ -26,11 +26,15 @@ function webdav_storage_uninstall() function webdav_storage_instance(App $a, array &$data) { - $config = new WebDavConfig(DI::l10n(), DI::config(), DI::httpClient()); - $data['storage'] = new WebDav($config->getUrl(), $config->getAuthOptions(), DI::httpClient(), DI::logger()); + if ($data['name'] == WebDav::getName()) { + $config = new WebDavConfig(DI::l10n(), DI::config(), DI::httpClient()); + $data['storage'] = new WebDav($config->getUrl(), $config->getAuthOptions(), DI::httpClient(), DI::logger()); + } } function webdav_storage_config(App $a, array &$data) { - $data['storage_config'] = new WebDavConfig(DI::l10n(), DI::config(), DI::httpClient()); + if ($data['name'] == WebDav::getName()) { + $data['storage_config'] = new WebDavConfig(DI::l10n(), DI::config(), DI::httpClient()); + } }