Fix publish-url property & getPublishStatus() fct

3 files changed, 20 insertions, 18 deletions

diff --git a/apps/dav/lib/CalDAV/CalDavBackend.php b/apps/dav/lib/CalDAV/CalDavBackend.php
index 43466b235e5..8c651251106 100644
--- a/apps/dav/lib/CalDAV/CalDavBackend.php
+++ b/apps/dav/lib/CalDAV/CalDavBackend.php
@@ -1501,13 +1501,16 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
 	 */
 	public function getPublishStatus($calendar) {
 		$query = $this->db->getQueryBuilder();
-		$result = $query->select(['principaluri', 'access'])
+		$result = $query->select('count(id)')
 			->from('dav_shares')
 			->where($query->expr()->eq('resourceid', $query->createNamedParameter($calendar->getResourceId())))
-			->andWhere($query->expr()->eq('type', $query->createNamedParameter(self::CLASSIFICATION_PUBLIC)))
+			->andWhere($query->expr()->eq('access', $query->createNamedParameter(self::ACCESS_PUBLIC)))
 			->execute();
 
-		return count($result->fetch()) > 0;
+		$row = $result->fetch();
+		$result->closeCursor();
+
+		return $row;
 	}
 
 	/**
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);
+          });
         }
     }
 
diff --git a/apps/dav/lib/CalDAV/Publishing/Xml/Publisher.php b/apps/dav/lib/CalDAV/Publishing/Xml/Publisher.php
index 008b5df9125..6a0d8b2ec0c 100644
--- a/apps/dav/lib/CalDAV/Publishing/Xml/Publisher.php
+++ b/apps/dav/lib/CalDAV/Publishing/Xml/Publisher.php
@@ -57,9 +57,9 @@ class Publisher implements XmlSerializable {
 
      $cs = '{' . Plugin::NS_CALENDARSERVER . '}';
      if (!$this->isPublished) {
-       $writer->write($this->publishUrl);
+       $writer->write($this->publishUrl); // for pre-publish-url
      } else {
-       $writer->writeElement('{DAV:}href', $this->publishUrl);
+       $writer->writeElement('{DAV:}href', $this->publishUrl); // for publish-url
      }
 
   }