diff options
| author | Roeland Jago Douma <roeland@famdouma.nl> | 2016-10-19 10:49:43 +0200 |
|---|---|---|
| committer | Roeland Jago Douma <roeland@famdouma.nl> | 2016-11-04 15:10:15 +0100 |
| commit | 6d1c0be47d2f3052f7e6c35377feee2ceb2cee29 (patch) | |
| tree | 0fefdf12d933702abf4088432038e26afbb3e825 /apps | |
| parent | 9fa3a22ddd7703302c4d8c452b8d2a6b5a401287 (diff) | |
| download | nextcloud-server-6d1c0be47d2f3052f7e6c35377feee2ceb2cee29.tar.gz nextcloud-server-6d1c0be47d2f3052f7e6c35377feee2ceb2cee29.zip | |
Minor fixes
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/dav/lib/CalDAV/CalDavBackend.php | 6 | ||||
| -rw-r--r-- | apps/dav/lib/CalDAV/Calendar.php | 2 | ||||
| -rw-r--r-- | apps/dav/lib/Server.php | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/apps/dav/lib/CalDAV/CalDavBackend.php b/apps/dav/lib/CalDAV/CalDavBackend.php index fb608c2009d..d77c761a2cf 100644 --- a/apps/dav/lib/CalDAV/CalDavBackend.php +++ b/apps/dav/lib/CalDAV/CalDavBackend.php @@ -37,7 +37,6 @@ use Sabre\CalDAV\Backend\AbstractBackend; use Sabre\CalDAV\Backend\SchedulingSupport; use Sabre\CalDAV\Backend\SubscriptionSupport; use Sabre\CalDAV\Backend\SyncSupport; -use Sabre\CalDAV\Plugin; use Sabre\CalDAV\Xml\Property\ScheduleCalendarTransp; use Sabre\CalDAV\Xml\Property\SupportedCalendarComponentSet; use Sabre\DAV; @@ -236,6 +235,7 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription '{http://sabredav.org/ns}sync-token' => $row['synctoken']?$row['synctoken']:'0', '{' . Plugin::NS_CALDAV . '}supported-calendar-component-set' => new SupportedCalendarComponentSet($components), '{' . Plugin::NS_CALDAV . '}schedule-calendar-transp' => new ScheduleCalendarTransp($row['transparent']?'transparent':'opaque'), + '{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}owner-principal' => $principalUri, ]; foreach($this->propertyMap as $xmlName=>$dbName) { @@ -1658,7 +1658,7 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription $it = new EventIterator($vObject, (string)$component->UID); $maxDate = new \DateTime(self::MAX_DATE); if ($it->isInfinite()) { - $lastOccurrence = $maxDate->getTimeStamp(); + $lastOccurrence = $maxDate->getTimestamp(); } else { $end = $it->getDtEnd(); while($it->valid() && $end < $maxDate) { @@ -1666,7 +1666,7 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription $it->next(); } - $lastOccurrence = $end->getTimeStamp(); + $lastOccurrence = $end->getTimestamp(); } } diff --git a/apps/dav/lib/CalDAV/Calendar.php b/apps/dav/lib/CalDAV/Calendar.php index fc08c9ac87a..2df8944b83f 100644 --- a/apps/dav/lib/CalDAV/Calendar.php +++ b/apps/dav/lib/CalDAV/Calendar.php @@ -283,7 +283,7 @@ class Calendar extends \Sabre\CalDAV\Calendar implements IShareable { } private function isShared() { - return isset($this->calendarInfo['{http://owncloud.org/ns}owner-principal']); + return $this->calendarInfo['{http://owncloud.org/ns}owner-principal'] !== $this->calendarInfo['principaluri']; } public function isSubscription() { diff --git a/apps/dav/lib/Server.php b/apps/dav/lib/Server.php index 9d74bac71fa..385a2fa93d9 100644 --- a/apps/dav/lib/Server.php +++ b/apps/dav/lib/Server.php @@ -125,7 +125,7 @@ class Server { $this->server->addPlugin(new DAV\Sharing\Plugin($authBackend, \OC::$server->getRequest())); $this->server->addPlugin(new \OCA\DAV\CalDAV\Publishing\PublishPlugin( \OC::$server->getConfig(), - \OC::$server->getUrlGenerator() + \OC::$server->getURLGenerator() )); // addressbook plugins |