Make webdav enabled by default

Fix contentType detection and remote URL values for invitations.
pydio · Feb 29, 2016 · b652544 · b652544
1 parent 5265069
commit b652544
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/core/src/plugins/access.webdav/manifest.xml b/core/src/plugins/access.webdav/manifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<ajxpdriver name="webdav" enabled="false" label="CONF_MESSAGE[WebDAV]" description="CONF_MESSAGE[Access WebDAV through Guzzle and SabreDAV]" mixins="credentials_consumer,filesystem_commons,slug_provider,template_provider" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="file:../core.ajaxplorer/ajxp_registry.xsd">
+<ajxpdriver name="webdav" enabled="true" label="CONF_MESSAGE[WebDAV]" description="CONF_MESSAGE[Access WebDAV through Guzzle and SabreDAV]" mixins="credentials_consumer,filesystem_commons,slug_provider,template_provider" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="file:../core.ajaxplorer/ajxp_registry.xsd">
     <class_definition filename="plugins/access.webdav/vendor/autoload.php" classname="Pydio\Access\WebDAV\Driver"/>
     <client_settings icon="plugins/access.fs/icon.png" description_template="{HOST}/{PATH}" iconClass="icon-sitemap">
         <resources>

diff --git a/core/src/plugins/core.ocs/src/Client/OCSClient.php b/core/src/plugins/core.ocs/src/Client/OCSClient.php
@@ -59,7 +59,7 @@ public function sendInvitation(ShareInvitation $invitation)
             'name' => $invitation->getDocumentName(),
             'remoteId' => $invitation->getId(),
             'owner' => $invitation->getOwner(),
-            'remote' => AJXP_Utils::detectServerUrl()
+            'remote' => AJXP_Utils::detectServerUrl(true)
         ];
 
         $response = $client->post($path.$endpoints['share'], [
@@ -190,7 +190,7 @@ public static function findEndpointsForClient($client)
             throw new \Exception('Could not get OCS Provider endpoints');
         }
 
-        $contentType = $response->getHeader('Content-Type');
+        $contentType = array_shift(explode(";", $response->getHeader('Content-Type')));
         if (array_search($contentType, ['text/json', 'application/json']) !== false) {
             $response = $response->json();
         } else if (array_search($contentType, ['text/xml', 'application/xml']) !== false) {