mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Minor fixes 

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
This commit is contained in:
Roeland Jago Douma 2016-10-19 10:49:43 +02:00
parent 9fa3a22ddd
commit 6d1c0be47d
No known key found for this signature in database
GPG Key ID: 1E152838F164D13B
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/dav/lib/CalDAV/CalDavBackend.php
View File

@ -37,7 +37,6 @@ use Sabre\CalDAV\Backend\AbstractBackend;
use Sabre\CalDAV\Backend\SchedulingSupport; use Sabre\CalDAV\Backend\SchedulingSupport;
use Sabre\CalDAV\Backend\SubscriptionSupport; use Sabre\CalDAV\Backend\SubscriptionSupport;
use Sabre\CalDAV\Backend\SyncSupport; use Sabre\CalDAV\Backend\SyncSupport;
use Sabre\CalDAV\Plugin;
use Sabre\CalDAV\Xml\Property\ScheduleCalendarTransp; use Sabre\CalDAV\Xml\Property\ScheduleCalendarTransp;
use Sabre\CalDAV\Xml\Property\SupportedCalendarComponentSet; use Sabre\CalDAV\Xml\Property\SupportedCalendarComponentSet;
use Sabre\DAV; 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', '{http://sabredav.org/ns}sync-token' => $row['synctoken']?$row['synctoken']:'0',
'{' . Plugin::NS_CALDAV . '}supported-calendar-component-set' => new SupportedCalendarComponentSet($components), '{' . Plugin::NS_CALDAV . '}supported-calendar-component-set' => new SupportedCalendarComponentSet($components),
'{' . Plugin::NS_CALDAV . '}schedule-calendar-transp' => new ScheduleCalendarTransp($row['transparent']?'transparent':'opaque'), '{' . 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) { foreach($this->propertyMap as $xmlName=>$dbName) {
@ -1658,7 +1658,7 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
$it = new EventIterator($vObject, (string)$component->UID); $it = new EventIterator($vObject, (string)$component->UID);
$maxDate = new \DateTime(self::MAX_DATE); $maxDate = new \DateTime(self::MAX_DATE);
if ($it->isInfinite()) { if ($it->isInfinite()) {
$lastOccurrence = $maxDate->getTimeStamp(); $lastOccurrence = $maxDate->getTimestamp();
} else { } else {
$end = $it->getDtEnd(); $end = $it->getDtEnd();
while($it->valid() && $end < $maxDate) { while($it->valid() && $end < $maxDate) {
@ -1666,7 +1666,7 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
$it->next(); $it->next();
} }
$lastOccurrence = $end->getTimeStamp(); $lastOccurrence = $end->getTimestamp();
} }
} }

2
apps/dav/lib/CalDAV/Calendar.php
View File

@ -283,7 +283,7 @@ class Calendar extends \Sabre\CalDAV\Calendar implements IShareable {
} }
private function isShared() { 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() { public function isSubscription() {

2
apps/dav/lib/Server.php
View File

@ -125,7 +125,7 @@ class Server {
$this->server->addPlugin(new DAV\Sharing\Plugin($authBackend, \OC::$server->getRequest())); $this->server->addPlugin(new DAV\Sharing\Plugin($authBackend, \OC::$server->getRequest()));
$this->server->addPlugin(new \OCA\DAV\CalDAV\Publishing\PublishPlugin( $this->server->addPlugin(new \OCA\DAV\CalDAV\Publishing\PublishPlugin(
\OC::$server->getConfig(), \OC::$server->getConfig(),
\OC::$server->getUrlGenerator() \OC::$server->getURLGenerator()
)); ));
// addressbook plugins // addressbook plugins