WEBDAV_URI now should not include the base /URI

pydio · Sep 8, 2016 · 93422b9 · 93422b9
1 parent bd80796
commit 93422b9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/core/src/plugins/core.ajaxplorer/manifest.xml b/core/src/plugins/core.ajaxplorer/manifest.xml
@@ -25,7 +25,7 @@
 		<global_param name="PUBLIC_DOWNLOAD_URL" default="" group="CONF_MESSAGE[Sharing]" type="string" label="CONF_MESSAGE[Download URL]" description="CONF_MESSAGE[If not inferred directly from the current pydio URL plus the public base URI, replace the public access URL here.]" mandatory="false"/>
 		<global_param name="WEBDAV_ENABLE" group="CONF_MESSAGE[WebDAV Server]" type="boolean" label="CONF_MESSAGE[Enable WebDAV]" description="CONF_MESSAGE[Enable the webDAV support. Please READ THE DOC to safely use this feature.]" mandatory="false" default="false"/>
 		<global_param name="WEBDAV_ACTIVE_ALL" group="CONF_MESSAGE[WebDAV Server]" type="boolean" label="CONF_MESSAGE[Enable for all users]" description="CONF_MESSAGE[Enable WebDAV for all users by default. If set to false, users will have to manually enable WebDAV via their preferences panel.]" mandatory="false" default="false"/>
-		<global_param name="WEBDAV_BASEURI" group="CONF_MESSAGE[WebDAV Server]" type="string" label="CONF_MESSAGE[Shares URI]" description="CONF_MESSAGE[Common URI to access the shares. Please READ THE DOC to safely use this feature.]" mandatory="false" default="/pydio/shares"/>
+		<global_param name="WEBDAV_BASEURI" group="CONF_MESSAGE[WebDAV Server]" type="string" label="CONF_MESSAGE[Shares URI]" description="CONF_MESSAGE[Common URI to access the shares. Please READ THE DOC to safely use this feature.]" mandatory="false" default="/shares"/>
 		<global_param name="WEBDAV_BASEHOST" group="CONF_MESSAGE[WebDAV Server]" type="string" label="CONF_MESSAGE[Shares Host]" description="CONF_MESSAGE[Host used in webDAV protocol. Should be detected by default. Please READ THE DOC to safely use this feature.]" mandatory="false" default=""/>
 		<global_param name="WEBDAV_DIGESTREALM" group="CONF_MESSAGE[WebDAV Server]" type="string" label="CONF_MESSAGE[Digest Realm]" description="CONF_MESSAGE[Default realm for authentication. Please READ THE DOC to safely use this feature.]" mandatory="false" default="ajxp_webdav_realm"/>
 		<global_param name="WEBDAV_FORCE_BASIC" group="CONF_MESSAGE[WebDAV Server]" type="boolean" label="CONF_MESSAGE[Force Basic Auth]" description="CONF_MESSAGE[This authentication mechanism is less secure, but will avoid the users having to re-enter a password in some case.]" mandatory="false" default="false"/>

diff --git a/core/src/plugins/core.conf/AbstractConfDriver.php b/core/src/plugins/core.conf/AbstractConfDriver.php
@@ -912,7 +912,7 @@ public function switchAction(ServerRequestInterface $requestInterface, ResponseI
                 if (ConfService::getGlobalConf("WEBDAV_BASEHOST") != "") {
                     $baseURL = ConfService::getGlobalConf("WEBDAV_BASEHOST");
                 } else {
-                    $baseURL = ApplicationState::detectServerURL();
+                    $baseURL = ApplicationState::detectServerURL(true);
                 }
                 $webdavBaseUrl = $baseURL.ConfService::getGlobalConf("WEBDAV_BASEURI")."/";
                 $davData = $loggedUser->getPref("AJXP_WEBDAV_DATA");