properly mark birthday calendars as not shareable for now

Signed-off-by: Georg Ehrke <developer@georgehrke.com>

diff --git a/apps/dav/lib/CalDAV/Calendar.php b/apps/dav/lib/CalDAV/Calendar.php
index 38def19af1da0f8d52f6d0eb074b53abffa88f88..b875d42e0a3967e519fcb0f3628c91c8c68a2b87 100644 (file)
--- a/apps/dav/lib/CalDAV/Calendar.php
+++ b/apps/dav/lib/CalDAV/Calendar.php
@@ -363,7 +363,11 @@ class Calendar extends \Sabre\CalDAV\Calendar implements IShareable {
                return $this->caldavBackend->getPublishStatus($this);
        }
 
-       private function canWrite() {
+       public function canWrite() {
+               if ($this->getName() === BirthdayService::BIRTHDAY_CALENDAR_URI) {
+                       return false;
+               }
+
                if (isset($this->calendarInfo['{http://owncloud.org/ns}read-only'])) {
                        return !$this->calendarInfo['{http://owncloud.org/ns}read-only'];
                }

diff --git a/apps/dav/lib/CalDAV/Publishing/PublishPlugin.php b/apps/dav/lib/CalDAV/Publishing/PublishPlugin.php
index 53059818039f33a413edd00db17fbb96e171ba11..fc276fb25ca4197c95a7f4ae068212ccb734107b 100644 (file)
--- a/apps/dav/lib/CalDAV/Publishing/PublishPlugin.php
+++ b/apps/dav/lib/CalDAV/Publishing/PublishPlugin.php
@@ -126,7 +126,10 @@ class PublishPlugin extends ServerPlugin {
                        });
 
                        $propFind->handle('{'.self::NS_CALENDARSERVER.'}allowed-sharing-modes', function() use ($node) {
-                               return new AllowedSharingModes(!$node->isSubscription(), !$node->isSubscription());
+                               $canShare = (!$node->isSubscription() && $node->canWrite());
+                               $canPublish = (!$node->isSubscription() && $node->canWrite());
+
+                               return new AllowedSharingModes($canShare, $canPublish);
                        });
                }
        }