friendica/friendica-addons
8
3
Fork 14
Code Issues 3 Pull requests 2 Releases 16 Wiki Activity

Add name check for webdav configuration options

Browse source 
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.
This commit is contained in:
Gidi Kroon 2022-01-07 02:14:24 +01:00
parent 5c0b20b21f
commit 327bfcb2b5
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
webdav_storage/webdav_storage.php
View file

@ -26,11 +26,15 @@ function webdav_storage_uninstall()
function webdav_storage_instance(App $a, array &$data) function webdav_storage_instance(App $a, array &$data)
{ {
$config = new WebDavConfig(DI::l10n(), DI::config(), DI::httpClient()); if ($data['name'] == WebDav::getName()) {
$data['storage'] = new WebDav($config->getUrl(), $config->getAuthOptions(), DI::httpClient(), DI::logger()); $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) 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());
}
} }