[Pkg-owncloud-commits] [owncloud] 62/153: - update permissions - change xml tag to perm

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud.

commit e5ee84ca9b7c2b95275fa7ea1100fe8c34a4d695
Author: Thomas Müller <thomas.mueller at tmit.eu>
Date:   Fri May 9 17:18:43 2014 +0200

    - update permissions
    - change xml tag to perm
---
 lib/private/connector/sabre/filesplugin.php | 2 +-
 lib/private/connector/sabre/node.php        | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/lib/private/connector/sabre/filesplugin.php b/lib/private/connector/sabre/filesplugin.php
index e2ff574..1d8f280 100644
--- a/lib/private/connector/sabre/filesplugin.php
+++ b/lib/private/connector/sabre/filesplugin.php
@@ -37,7 +37,7 @@ class OC_Connector_Sabre_FilesPlugin extends Sabre_DAV_ServerPlugin
 
 		$server->xmlNamespaces[self::NS_OWNCLOUD] = 'oc';
 		$server->protectedProperties[] = '{' . self::NS_OWNCLOUD . '}id';
-		$server->protectedProperties[] = '{' . self::NS_OWNCLOUD . '}permissions';
+		$server->protectedProperties[] = '{' . self::NS_OWNCLOUD . '}perm';
 
 		$this->server = $server;
 		$this->server->subscribeEvent('beforeGetProperties', array($this, 'beforeGetProperties'));
diff --git a/lib/private/connector/sabre/node.php b/lib/private/connector/sabre/node.php
index ca8dcce..ee38dfc 100644
--- a/lib/private/connector/sabre/node.php
+++ b/lib/private/connector/sabre/node.php
@@ -252,14 +252,17 @@ abstract class OC_Connector_Sabre_Node implements Sabre_DAV_INode, Sabre_DAV_IPr
 		if ($this->info->isMounted()) {
 			$p .= 'M';
 		}
+		if ($this->info->isDeletable()) {
+			$p .= 'D';
+		}
+		if ($this->info->isDeletable()) {
+			$p .= 'N';
+		}
 		if ($this->info->getType() === \OCP\Files\FileInfo::TYPE_FILE) {
 			if ($this->info->isUpdateable()) {
 				$p .= 'W';
 			}
 		} else {
-			if ($this->info->isDeletable()) {
-				$p .= 'D';
-			}
 			if ($this->info->isUpdateable()) {
 				$p .= 'CK';
 			}

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git