[Pkg-owncloud-commits] [php-sabredav] 29/220: CS
David Prévot
taffit at moszumanska.debian.org
Thu May 12 01:21:04 UTC 2016
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository php-sabredav.
commit d6b9187d6b72675d2af6841a6bc6b5341ff32ed5
Author: Evert Pot <me at evertpot.com>
Date: Tue Oct 20 16:48:58 2015 -0400
CS
---
lib/CalDAV/Schedule/Plugin.php | 2 +-
lib/CalDAV/SharingPlugin.php | 13 ++++---------
lib/DAV/Xml/Property/ShareAccess.php | 1 -
3 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/lib/CalDAV/Schedule/Plugin.php b/lib/CalDAV/Schedule/Plugin.php
index 2cfc942..6f95990 100644
--- a/lib/CalDAV/Schedule/Plugin.php
+++ b/lib/CalDAV/Schedule/Plugin.php
@@ -245,7 +245,7 @@ class Plugin extends ServerPlugin {
// Node is either not a calendar
continue;
}
- if (isset($child[200]['{DAV:}share-access']) ) {
+ if (isset($child[200]['{DAV:}share-access'])) {
$shareAccess = $child[200]['{DAV:}share-access']->getValue();
if ($shareAccess !== Sharing\Plugin::ACCESS_NOTSHARED && $shareAccess !== Sharing\Plugin::ACCESS_OWNER) {
// Node is a shared node, not owned by the relevant
diff --git a/lib/CalDAV/SharingPlugin.php b/lib/CalDAV/SharingPlugin.php
index 9d0ebeb..97f951e 100644
--- a/lib/CalDAV/SharingPlugin.php
+++ b/lib/CalDAV/SharingPlugin.php
@@ -130,13 +130,8 @@ class SharingPlugin extends DAV\ServerPlugin {
if ($node instanceof ISharedCalendar) {
/**
- $propFind->handle('{' . Plugin::NS_CALENDARSERVER . '}shared-url', function() use ($node) {
- return new Href(
- $node->getSharedUrl()
- );
- });
- **/
-
+ });
+ **/
$propFind->handle('{' . Plugin::NS_CALENDARSERVER . '}invite', function() use ($node) {
// Fetching owner information
@@ -187,7 +182,7 @@ class SharingPlugin extends DAV\ServerPlugin {
if ($node instanceof ISharedCalendar) {
$shareAccess = $node->getShareAccess();
if ($rt = $propFind->get('{DAV:}resourcetype')) {
- switch($shareAccess) {
+ switch ($shareAccess) {
case \Sabre\DAV\Sharing\Plugin::ACCESS_OWNER :
$rt->add('{' . Plugin::NS_CALENDARSERVER . '}shared-owner');
break;
@@ -227,7 +222,7 @@ class SharingPlugin extends DAV\ServerPlugin {
if (!$node instanceof ISharedCalendar)
return;
- if ($node->getShareAccess()===\Sabre\DAV\Sharing\Plugin::ACCESS_OWNER || $node->getShareAccess()===\Sabre\DAV\Sharing\Plugin::ACCESS_NOTSHARED) {
+ if ($node->getShareAccess() === \Sabre\DAV\Sharing\Plugin::ACCESS_OWNER || $node->getShareAccess() === \Sabre\DAV\Sharing\Plugin::ACCESS_NOTSHARED) {
$propPatch->handle('{DAV:}resourcetype', function($value) use ($node) {
if ($value->is('{' . Plugin::NS_CALENDARSERVER . '}shared-owner')) return false;
diff --git a/lib/DAV/Xml/Property/ShareAccess.php b/lib/DAV/Xml/Property/ShareAccess.php
index 567abb1..e4b1a66 100644
--- a/lib/DAV/Xml/Property/ShareAccess.php
+++ b/lib/DAV/Xml/Property/ShareAccess.php
@@ -4,7 +4,6 @@ namespace Sabre\DAV\Xml\Property;
use Sabre\Xml\Writer;
use Sabre\Xml\XmlSerializable;
-
use Sabre\DAV\Sharing\Plugin as SharingPlugin;
/**
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-php/php-sabredav.git
More information about the Pkg-owncloud-commits
mailing list