Fix publish-url property & getPublishStatus() fct

1 files changed, 12 insertions, 13 deletions

diff --git a/apps/dav/lib/CalDAV/Publishing/PublishPlugin.php b/apps/dav/lib/CalDAV/Publishing/PublishPlugin.php
index b1c42624201..f0be2f3a1b6 100644
--- a/apps/dav/lib/CalDAV/Publishing/PublishPlugin.php
+++ b/apps/dav/lib/CalDAV/Publishing/PublishPlugin.php
@@ -72,19 +72,18 @@ class PublishPlugin extends ServerPlugin
     public function propFind(PropFind $propFind, INode $node)
     {
         if ($node instanceof Calendar) {
-            $token = md5(\OC::$server->getConfig()->getSystemValue('secret', '').$node->getName());
-
-        $propFind->handle('{'.self::NS_CALENDARSERVER.'}publish-url', function () use ($node, $token) {
-          if ($node->getPublishStatus()) {
-              return new Publisher($token, $node->getPublishStatus());
-          }
-        });
-
-        $propFind->handle('{'.self::NS_CALENDARSERVER.'}pre-publish-url', function () use ($node, $token) {
-          if ($node->getPublishStatus()) {
-              return new Publisher($token, false);
-          }
-        });
+          $token = md5(\OC::$server->getConfig()->getSystemValue('secret', '').$node->getName());
+          $publishUrl = $this->server->getBaseUri() . 'public-calendars/' . $token;
+
+          $propFind->handle('{'.self::NS_CALENDARSERVER.'}publish-url', function () use ($node, $publishUrl) {
+            if ($node->getPublishStatus()) {
+                return new Publisher($publishUrl, $node->getPublishStatus());
+            }
+          });
+
+          $propFind->handle('{'.self::NS_CALENDARSERVER.'}pre-publish-url', function () use ($node, $publishUrl) {
+                return new Publisher($publishUrl, false);
+          });
         }
     }