Update all to use OCP\PERMISSION_* instead of OCP\Share::PERMISSION_*

diff --git a/apps/files/index.php b/apps/files/index.php
index c46ec59d03c22a84742360f5959e68a755c65fba..74332a439f66abf236830550a855c88cc0b49000 100644 (file)
--- a/apps/files/index.php
+++ b/apps/files/index.php
@@ -89,15 +89,15 @@ $freeSpace=OC_Filesystem::free_space($dir);
 $freeSpace=max($freeSpace, 0);
 $maxUploadFilesize = min($maxUploadFilesize, $freeSpace);
 
-$permissions = OCP\Share::PERMISSION_READ;
+$permissions = OCP\PERMISSION_READ;
 if (OC_Filesystem::isUpdatable($dir.'/')) {
-       $permissions |= OCP\Share::PERMISSION_UPDATE;
+       $permissions |= OCP\PERMISSION_UPDATE;
 }
 if (OC_Filesystem::isDeletable($dir.'/')) {
-       $permissions |= OCP\Share::PERMISSION_DELETE;
+       $permissions |= OCP\PERMISSION_DELETE;
 }
 if (OC_Filesystem::isSharable($dir.'/')) {
-       $permissions |= OCP\Share::PERMISSION_SHARE;
+       $permissions |= OCP\PERMISSION_SHARE;
 }
 
 $tmpl = new OCP\Template( 'files', 'index', 'user' );

diff --git a/apps/files/templates/index.php b/apps/files/templates/index.php
index e2640c1113cf9d72f63661fff24a50e9b551bf73..725390d450580b8fb2527355a495790526cfb193 100644 (file)
--- a/apps/files/templates/index.php
+++ b/apps/files/templates/index.php
@@ -58,7 +58,7 @@
                        <th id="headerSize"><?php echo $l->t( 'Size' ); ?></th>
                        <th id="headerDate">
                                <span id="modified"><?php echo $l->t( 'Modified' ); ?></span>
-                               <?php if ($_['permissions'] & OCP\Share::PERMISSION_DELETE): ?>
+                               <?php if ($_['permissions'] & OCP\PERMISSION_DELETE): ?>
 <!--                                   NOTE: Temporary fix to allow unsharing of files in root of Shared folder -->
                                        <?php if ($_['dir'] == '/Shared'): ?>
                                                <span class="selectedActions"><a href="" class="delete"><?php echo $l->t('Unshare')?> <img class="svg" alt="<?php echo $l->t('Unshare')?>" src="<?php echo OCP\image_path("core", "actions/delete.svg"); ?>" /></a></span>

diff --git a/apps/files_sharing/appinfo/update.php b/apps/files_sharing/appinfo/update.php
index e75c538b1502a5d1196d60e62b36084e3707956b..e998626f4a4d1e98ab31e44c7ada9c49c271b291 100644 (file)
--- a/apps/files_sharing/appinfo/update.php
+++ b/apps/files_sharing/appinfo/update.php
@@ -19,11 +19,11 @@ if (version_compare($installedVersion, '0.3', '<')) {
                                $itemType = 'file';
                        }
                        if ($row['permissions'] == 0) {
-                               $permissions = OCP\Share::PERMISSION_READ | OCP\Share::PERMISSION_SHARE;
+                               $permissions = OCP\PERMISSION_READ | OCP\PERMISSION_SHARE;
                        } else {
-                               $permissions = OCP\Share::PERMISSION_READ | OCP\Share::PERMISSION_UPDATE | OCP\Share::PERMISSION_SHARE;
+                               $permissions = OCP\PERMISSION_READ | OCP\PERMISSION_UPDATE | OCP\PERMISSION_SHARE;
                                if ($itemType == 'folder') {
-                                       $permissions |= OCP\Share::PERMISSION_CREATE;
+                                       $permissions |= OCP\PERMISSION_CREATE;
                                }
                        }
                        $pos = strrpos($row['uid_shared_with'], '@');

diff --git a/apps/files_sharing/lib/share/file.php b/apps/files_sharing/lib/share/file.php
index 9a88050592638f3a23630b5ae3bb85c7a3db66dd..ac5852368319b2e848e021fb3be58c8b7406a220 100644 (file)
--- a/apps/files_sharing/lib/share/file.php
+++ b/apps/files_sharing/lib/share/file.php
@@ -97,10 +97,10 @@ class OC_Share_Backend_File implements OCP\Share_Backend_File_Dependent {
                                $file['permissions'] = $item['permissions'];
                                if ($file['type'] == 'file') {
                                        // Remove Create permission if type is file
-                                       $file['permissions'] &= ~OCP\Share::PERMISSION_CREATE;
+                                       $file['permissions'] &= ~OCP\PERMISSION_CREATE;
                                }
                                // NOTE: Temporary fix to allow unsharing of files in root of Shared directory
-                               $file['permissions'] |= OCP\Share::PERMISSION_DELETE;
+                               $file['permissions'] |= OCP\PERMISSION_DELETE;
                                $files[] = $file;
                        }
                        return $files;
@@ -113,7 +113,7 @@ class OC_Share_Backend_File implements OCP\Share_Backend_File_Dependent {
                                }
                                $size += $item['size'];
                        }
-                       return array(0 => array('id' => -1, 'name' => 'Shared', 'mtime' => $mtime, 'mimetype' => 'httpd/unix-directory', 'size' => $size, 'writable' => false, 'type' => 'dir', 'directory' => '', 'permissions' => OCP\Share::PERMISSION_READ));
+                       return array(0 => array('id' => -1, 'name' => 'Shared', 'mtime' => $mtime, 'mimetype' => 'httpd/unix-directory', 'size' => $size, 'writable' => false, 'type' => 'dir', 'directory' => '', 'permissions' => OCP\PERMISSION_READ));
                } else if ($format == self::FORMAT_OPENDIR) {
                        $files = array();
                        foreach ($items as $item) {

diff --git a/apps/files_sharing/lib/share/folder.php b/apps/files_sharing/lib/share/folder.php
index bddda99f8bbac0c6e21d0e899b0d0264e687218a..d414fcf10fcfeb6c1d22856055b5493aba09cd94 100644 (file)
--- a/apps/files_sharing/lib/share/folder.php
+++ b/apps/files_sharing/lib/share/folder.php
@@ -41,7 +41,7 @@ class OC_Share_Backend_Folder extends OC_Share_Backend_File implements OCP\Share
                                $file['permissions'] = $folder['permissions'];
                                if ($file['type'] == 'file') {
                                        // Remove Create permission if type is file
-                                       $file['permissions'] &= ~OCP\Share::PERMISSION_CREATE;
+                                       $file['permissions'] &= ~OCP\PERMISSION_CREATE;
                                }
                        }
                        return $files;

diff --git a/apps/files_sharing/lib/sharedstorage.php b/apps/files_sharing/lib/sharedstorage.php
index ac6fb1f683e6f1d4fd3b5c145b8bbc2f74bade5e..50db9166fe7d1702a04c330e343ef7af75c09255 100644 (file)
--- a/apps/files_sharing/lib/sharedstorage.php
+++ b/apps/files_sharing/lib/sharedstorage.php
@@ -201,7 +201,7 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common {
                if ($path == '') {
                        return false;
                }
-               return ($this->getPermissions($path) & OCP\Share::PERMISSION_CREATE);
+               return ($this->getPermissions($path) & OCP\PERMISSION_CREATE);
        }
 
        public function isReadable($path) {
@@ -212,21 +212,21 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common {
                if ($path == '') {
                        return false;
                }
-               return ($this->getPermissions($path) & OCP\Share::PERMISSION_UPDATE);
+               return ($this->getPermissions($path) & OCP\PERMISSION_UPDATE);
        }
 
        public function isDeletable($path) {
                if ($path == '') {
                        return true;
                }
-               return ($this->getPermissions($path) & OCP\Share::PERMISSION_DELETE);
+               return ($this->getPermissions($path) & OCP\PERMISSION_DELETE);
        }
 
        public function isSharable($path) {
                if ($path == '') {
                        return false;
                }
-               return ($this->getPermissions($path) & OCP\Share::PERMISSION_SHARE);
+               return ($this->getPermissions($path) & OCP\PERMISSION_SHARE);
        }
 
        public function file_exists($path) {

diff --git a/apps/files_sharing/public.php b/apps/files_sharing/public.php
index 598172aa855559f284313b5ed69518c0627a443d..1fc41b427560a2ff03247f2f1ef6a7b1e8f771d9 100644 (file)
--- a/apps/files_sharing/public.php
+++ b/apps/files_sharing/public.php
@@ -147,7 +147,7 @@ if (isset($_GET['file']) || isset($_GET['dir'])) {
                                                if ($i['directory'] == '/') {
                                                        $i['directory'] = '';
                                                }
-                                               $i['permissions'] = OCP\Share::PERMISSION_READ;
+                                               $i['permissions'] = OCP\PERMISSION_READ;
                                                $files[] = $i;
                                        }
                                        // Make breadcrumb

diff --git a/lib/files.php b/lib/files.php
index ac4aa36c01d6bd5979d6d5359de790f63b7f6127..e5bf78d032fb6dbbd65a113c41080b2b69137cac 100644 (file)
--- a/lib/files.php
+++ b/lib/files.php
@@ -91,16 +91,16 @@ class OC_Files {
                        foreach ($files as &$file) {
                                $file['directory'] = $directory;
                                $file['type'] = ($file['mimetype'] == 'httpd/unix-directory') ? 'dir' : 'file';
-                               $permissions = OCP\Share::PERMISSION_READ;
+                               $permissions = OCP\PERMISSION_READ;
                                // NOTE: Remove check when new encryption is merged
                                if (!$file['encrypted']) {
-                                       $permissions |= OCP\Share::PERMISSION_SHARE;
+                                       $permissions |= OCP\PERMISSION_SHARE;
                                }
                                if ($file['type'] == 'dir' && $file['writable']) {
-                                       $permissions |= OCP\Share::PERMISSION_CREATE;
+                                       $permissions |= OCP\PERMISSION_CREATE;
                                }
                                if ($file['writable']) {
-                                       $permissions |= OCP\Share::PERMISSION_UPDATE | OCP\Share::PERMISSION_DELETE;
+                                       $permissions |= OCP\PERMISSION_UPDATE | OCP\PERMISSION_DELETE;
                                }
                                $file['permissions'] = $permissions;
                        }

diff --git a/lib/public/share.php b/lib/public/share.php
index 071304ec24943ffa9383d469431698737be0ea7e..24de4dcd5b21f7f73046bd28f38058c3601e66e1 100644 (file)
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -46,12 +46,8 @@ class Share {
        * Check if permission is granted with And (&) e.g. Check if delete is granted: if ($permissions & PERMISSION_DELETE)
        * Remove permissions with And (&) and Not (~) e.g. Remove the update permission: $permissions &= ~PERMISSION_UPDATE
        * Apps are required to handle permissions on their own, this class only stores and manages the permissions of shares
+       * @see lib/public/constants.php
        */
-       const PERMISSION_CREATE = 4;
-       const PERMISSION_READ = 1;
-       const PERMISSION_UPDATE = 2;
-       const PERMISSION_DELETE = 8;
-       const PERMISSION_SHARE = 16;
 
        const FORMAT_NONE = -1;
        const FORMAT_STATUSES = -2;
@@ -402,7 +398,7 @@ class Share {
                        // Check if permissions were removed
                        if ($item['permissions'] & ~$permissions) {
                                // If share permission is removed all reshares must be deleted
-                               if (($item['permissions'] & self::PERMISSION_SHARE) && (~$permissions & self::PERMISSION_SHARE)) {
+                               if (($item['permissions'] & PERMISSION_SHARE) && (~$permissions & PERMISSION_SHARE)) {
                                        self::delete($item['id'], true);
                                } else {
                                        $ids = array();
@@ -701,7 +697,7 @@ class Share {
                                                        $items[$id]['share_with'] = $row['share_with'];
                                                }
                                                // Switch ids if sharing permission is granted on only one share to ensure correct parent is used if resharing
-                                               if (~(int)$items[$id]['permissions'] & self::PERMISSION_SHARE && (int)$row['permissions'] & self::PERMISSION_SHARE) {
+                                               if (~(int)$items[$id]['permissions'] & PERMISSION_SHARE && (int)$row['permissions'] & PERMISSION_SHARE) {
                                                        $items[$row['id']] = $items[$id];
                                                        unset($items[$id]);
                                                        $id = $row['id'];
@@ -847,7 +843,7 @@ class Share {
                                throw new \Exception($message);
                        }
                        // Check if share permissions is granted
-                       if ((int)$checkReshare['permissions'] & self::PERMISSION_SHARE) {
+                       if ((int)$checkReshare['permissions'] & PERMISSION_SHARE) {
                                if (~(int)$checkReshare['permissions'] & $permissions) {
                                        $message = 'Sharing '.$itemSource.' failed, because the permissions exceed permissions granted to '.$uidOwner;
                                        \OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
@@ -1133,7 +1129,7 @@ class Share {
                                $duplicateParent = $query->execute(array($item['item_type'], $item['item_target'], self::SHARE_TYPE_USER, self::SHARE_TYPE_GROUP, self::$shareTypeGroupUserUnique, $item['uid_owner'], $item['parent']))->fetchRow();
                                if ($duplicateParent) {
                                        // Change the parent to the other item id if share permission is granted
-                                       if ($duplicateParent['permissions'] & self::PERMISSION_SHARE) {
+                                       if ($duplicateParent['permissions'] & PERMISSION_SHARE) {
                                                $query = \OC_DB::prepare('UPDATE `*PREFIX*share` SET `parent` = ? WHERE `id` = ?');
                                                $query->execute(array($duplicateParent['id'], $item['id']));
                                                continue;

diff --git a/tests/lib/share/share.php b/tests/lib/share/share.php
index 2cb6f7417d246ede1628ded67f045032d112f864..3cdae98ca6448020448ede4736f540c417a39cb7 100644 (file)
--- a/tests/lib/share/share.php
+++ b/tests/lib/share/share.php
@@ -64,7 +64,7 @@ class Test_Share extends UnitTestCase {
        public function testShareInvalidShareType() {
                $message = 'Share type foobar is not valid for test.txt';
                try {
-                       OCP\Share::shareItem('test', 'test.txt', 'foobar', $this->user2, OCP\Share::PERMISSION_READ);
+                       OCP\Share::shareItem('test', 'test.txt', 'foobar', $this->user2, OCP\PERMISSION_READ);
                } catch (Exception $exception) {
                        $this->assertEquals($message, $exception->getMessage());
                }
@@ -73,7 +73,7 @@ class Test_Share extends UnitTestCase {
        public function testInvalidItemType() {
                $message = 'Sharing backend for foobar not found';
                try {
-                       OCP\Share::shareItem('foobar', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user2, OCP\Share::PERMISSION_READ);
+                       OCP\Share::shareItem('foobar', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user2, OCP\PERMISSION_READ);
                        $this->fail('Exception was expected: '.$message);
                } catch (Exception $exception) {
                        $this->assertEquals($message, $exception->getMessage());
@@ -109,7 +109,7 @@ class Test_Share extends UnitTestCase {
                        $this->assertEquals($message, $exception->getMessage());
                }
                try {
-                       OCP\Share::setPermissions('foobar', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user2, OCP\Share::PERMISSION_UPDATE);
+                       OCP\Share::setPermissions('foobar', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user2, OCP\PERMISSION_UPDATE);
                        $this->fail('Exception was expected: '.$message);
                } catch (Exception $exception) {
                        $this->assertEquals($message, $exception->getMessage());
@@ -120,131 +120,131 @@ class Test_Share extends UnitTestCase {
                // Invalid shares
                $message = 'Sharing test.txt failed, because the user '.$this->user1.' is the item owner';
                try {
-                       OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user1, OCP\Share::PERMISSION_READ);
+                       OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user1, OCP\PERMISSION_READ);
                        $this->fail('Exception was expected: '.$message);
                } catch (Exception $exception) {
                        $this->assertEquals($message, $exception->getMessage());
                }
                $message = 'Sharing test.txt failed, because the user foobar does not exist';
                try {
-                       OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, 'foobar', OCP\Share::PERMISSION_READ);
+                       OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, 'foobar', OCP\PERMISSION_READ);
                        $this->fail('Exception was expected: '.$message);
                } catch (Exception $exception) {
                        $this->assertEquals($message, $exception->getMessage());
                }
                $message = 'Sharing foobar failed, because the sharing backend for test could not find its source';
                try {
-                       OCP\Share::shareItem('test', 'foobar', OCP\Share::SHARE_TYPE_USER, $this->user2, OCP\Share::PERMISSION_READ);
+                       OCP\Share::shareItem('test', 'foobar', OCP\Share::SHARE_TYPE_USER, $this->user2, OCP\PERMISSION_READ);
                        $this->fail('Exception was expected: '.$message);
                } catch (Exception $exception) {
                        $this->assertEquals($message, $exception->getMessage());
                }
-               
+
                // Valid share
-               $this->assertTrue(OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user2, OCP\Share::PERMISSION_READ));
+               $this->assertTrue(OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user2, OCP\PERMISSION_READ));
                $this->assertEquals(array('test.txt'), OCP\Share::getItemShared('test', 'test.txt', Test_Share_Backend::FORMAT_SOURCE));
                OC_User::setUserId($this->user2);
                $this->assertEquals(array('test.txt'), OCP\Share::getItemSharedWith('test', 'test.txt', Test_Share_Backend::FORMAT_SOURCE));
-               
+
                // Attempt to share again
                OC_User::setUserId($this->user1);
                $message = 'Sharing test.txt failed, because this item is already shared with '.$this->user2;
                try {
-                       OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user2, OCP\Share::PERMISSION_READ);
+                       OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user2, OCP\PERMISSION_READ);
                        $this->fail('Exception was expected: '.$message);
                } catch (Exception $exception) {
                        $this->assertEquals($message, $exception->getMessage());
                }
-               
+
                // Attempt to share back
                OC_User::setUserId($this->user2);
                $message = 'Sharing test.txt failed, because the user '.$this->user1.' is the original sharer';
                try {
-                       OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user1, OCP\Share::PERMISSION_READ);
+                       OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user1, OCP\PERMISSION_READ);
                        $this->fail('Exception was expected: '.$message);
                } catch (Exception $exception) {
                        $this->assertEquals($message, $exception->getMessage());
                }
-               
+
                // Unshare
                OC_User::setUserId($this->user1);
                $this->assertTrue(OCP\Share::unshare('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user2));
-               
+
                // Attempt reshare without share permission
-               $this->assertTrue(OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user2, OCP\Share::PERMISSION_READ));
+               $this->assertTrue(OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user2, OCP\PERMISSION_READ));
                OC_User::setUserId($this->user2);
                $message = 'Sharing test.txt failed, because resharing is not allowed';
                try {
-                       OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user3, OCP\Share::PERMISSION_READ);
+                       OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user3, OCP\PERMISSION_READ);
                        $this->fail('Exception was expected: '.$message);
                } catch (Exception $exception) {
                        $this->assertEquals($message, $exception->getMessage());
                }
-               
+
                // Owner grants share and update permission
                OC_User::setUserId($this->user1);
-               $this->assertTrue(OCP\Share::setPermissions('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user2, OCP\Share::PERMISSION_READ | OCP\Share::PERMISSION_UPDATE | OCP\Share::PERMISSION_SHARE));
-               
+               $this->assertTrue(OCP\Share::setPermissions('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user2, OCP\PERMISSION_READ | OCP\PERMISSION_UPDATE | OCP\PERMISSION_SHARE));
+
                // Attempt reshare with escalated permissions
                OC_User::setUserId($this->user2);
                $message = 'Sharing test.txt failed, because the permissions exceed permissions granted to '.$this->user2;
                try {
-                       OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user3, OCP\Share::PERMISSION_READ | OCP\Share::PERMISSION_DELETE);
+                       OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user3, OCP\PERMISSION_READ | OCP\PERMISSION_DELETE);
                        $this->fail('Exception was expected: '.$message);
                } catch (Exception $exception) {
                        $this->assertEquals($message, $exception->getMessage());
                }
-               
+
                // Valid reshare
-               $this->assertTrue(OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user3, OCP\Share::PERMISSION_READ | OCP\Share::PERMISSION_UPDATE));
+               $this->assertTrue(OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user3, OCP\PERMISSION_READ | OCP\PERMISSION_UPDATE));
                $this->assertEquals(array('test.txt'), OCP\Share::getItemShared('test', 'test.txt', Test_Share_Backend::FORMAT_SOURCE));
                OC_User::setUserId($this->user3);
                $this->assertEquals(array('test.txt'), OCP\Share::getItemSharedWith('test', 'test.txt', Test_Share_Backend::FORMAT_SOURCE));
-               $this->assertEquals(array(OCP\Share::PERMISSION_READ | OCP\Share::PERMISSION_UPDATE), OCP\Share::getItemSharedWith('test', 'test.txt', Test_Share_Backend::FORMAT_PERMISSIONS));
-               
+               $this->assertEquals(array(OCP\PERMISSION_READ | OCP\PERMISSION_UPDATE), OCP\Share::getItemSharedWith('test', 'test.txt', Test_Share_Backend::FORMAT_PERMISSIONS));
+
                // Attempt to escalate permissions
                OC_User::setUserId($this->user2);
                $message = 'Setting permissions for test.txt failed, because the permissions exceed permissions granted to '.$this->user2;
                try {
-                       OCP\Share::setPermissions('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user3, OCP\Share::PERMISSION_READ | OCP\Share::PERMISSION_DELETE);
+                       OCP\Share::setPermissions('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user3, OCP\PERMISSION_READ | OCP\PERMISSION_DELETE);
                        $this->fail('Exception was expected: '.$message);
                } catch (Exception $exception) {
                        $this->assertEquals($message, $exception->getMessage());
                }
-               
+
                // Remove update permission
                OC_User::setUserId($this->user1);
-               $this->assertTrue(OCP\Share::setPermissions('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user2, OCP\Share::PERMISSION_READ | OCP\Share::PERMISSION_SHARE));
+               $this->assertTrue(OCP\Share::setPermissions('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user2, OCP\PERMISSION_READ | OCP\PERMISSION_SHARE));
                OC_User::setUserId($this->user2);
-               $this->assertEquals(array(OCP\Share::PERMISSION_READ | OCP\Share::PERMISSION_SHARE), OCP\Share::getItemSharedWith('test', 'test.txt', Test_Share_Backend::FORMAT_PERMISSIONS));
+               $this->assertEquals(array(OCP\PERMISSION_READ | OCP\PERMISSION_SHARE), OCP\Share::getItemSharedWith('test', 'test.txt', Test_Share_Backend::FORMAT_PERMISSIONS));
                OC_User::setUserId($this->user3);
-               $this->assertEquals(array(OCP\Share::PERMISSION_READ), OCP\Share::getItemSharedWith('test', 'test.txt', Test_Share_Backend::FORMAT_PERMISSIONS));
-               
+               $this->assertEquals(array(OCP\PERMISSION_READ), OCP\Share::getItemSharedWith('test', 'test.txt', Test_Share_Backend::FORMAT_PERMISSIONS));
+
                // Remove share permission
                OC_User::setUserId($this->user1);
-               $this->assertTrue(OCP\Share::setPermissions('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user2, OCP\Share::PERMISSION_READ));
+               $this->assertTrue(OCP\Share::setPermissions('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user2, OCP\PERMISSION_READ));
                OC_User::setUserId($this->user2);
-               $this->assertEquals(array(OCP\Share::PERMISSION_READ), OCP\Share::getItemSharedWith('test', 'test.txt', Test_Share_Backend::FORMAT_PERMISSIONS));
+               $this->assertEquals(array(OCP\PERMISSION_READ), OCP\Share::getItemSharedWith('test', 'test.txt', Test_Share_Backend::FORMAT_PERMISSIONS));
                OC_User::setUserId($this->user3);
                $this->assertFalse(OCP\Share::getItemSharedWith('test', 'test.txt'));
-               
+
                // Reshare again, and then have owner unshare
                OC_User::setUserId($this->user1);
-               $this->assertTrue(OCP\Share::setPermissions('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user2, OCP\Share::PERMISSION_READ | OCP\Share::PERMISSION_SHARE));
+               $this->assertTrue(OCP\Share::setPermissions('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user2, OCP\PERMISSION_READ | OCP\PERMISSION_SHARE));
                OC_User::setUserId($this->user2);
-               $this->assertTrue(OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user3, OCP\Share::PERMISSION_READ));
+               $this->assertTrue(OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user3, OCP\PERMISSION_READ));
                OC_User::setUserId($this->user1);
                $this->assertTrue(OCP\Share::unshare('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user2));
                OC_User::setUserId($this->user2);
                $this->assertFalse(OCP\Share::getItemSharedWith('test', 'test.txt'));
                OC_User::setUserId($this->user3);
                $this->assertFalse(OCP\Share::getItemSharedWith('test', 'test.txt'));
-               
+
                // Attempt target conflict
                OC_User::setUserId($this->user1);
-               $this->assertTrue(OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user2, OCP\Share::PERMISSION_READ));
+               $this->assertTrue(OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user2, OCP\PERMISSION_READ));
                OC_User::setUserId($this->user3);
-               $this->assertTrue(OCP\Share::shareItem('test', 'share.txt', OCP\Share::SHARE_TYPE_USER, $this->user2, OCP\Share::PERMISSION_READ));
+               $this->assertTrue(OCP\Share::shareItem('test', 'share.txt', OCP\Share::SHARE_TYPE_USER, $this->user2, OCP\PERMISSION_READ));
 
                OC_User::setUserId($this->user2);
                $to_test = OCP\Share::getItemsSharedWith('test', Test_Share_Backend::FORMAT_TARGET);
@@ -263,7 +263,7 @@ class Test_Share extends UnitTestCase {
                // Invalid shares
                $message = 'Sharing test.txt failed, because the group foobar does not exist';
                try {
-                       OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_GROUP, 'foobar', OCP\Share::PERMISSION_READ);
+                       OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_GROUP, 'foobar', OCP\PERMISSION_READ);
                        $this->fail('Exception was expected: '.$message);
                } catch (Exception $exception) {
                        $this->assertEquals($message, $exception->getMessage());
@@ -272,131 +272,131 @@ class Test_Share extends UnitTestCase {
                OC_Appconfig::setValue('core', 'shareapi_share_policy', 'groups_only');
                $message = 'Sharing test.txt failed, because '.$this->user1.' is not a member of the group '.$this->group2;
                try {
-                       OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_GROUP, $this->group2, OCP\Share::PERMISSION_READ);
+                       OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_GROUP, $this->group2, OCP\PERMISSION_READ);
                        $this->fail('Exception was expected: '.$message);
                } catch (Exception $exception) {
                        $this->assertEquals($message, $exception->getMessage());
                }
                OC_Appconfig::setValue('core', 'shareapi_share_policy', $policy);
-               
+
                // Valid share
-               $this->assertTrue(OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_GROUP, $this->group1, OCP\Share::PERMISSION_READ));
+               $this->assertTrue(OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_GROUP, $this->group1, OCP\PERMISSION_READ));
                $this->assertEquals(array('test.txt'), OCP\Share::getItemShared('test', 'test.txt', Test_Share_Backend::FORMAT_SOURCE));
                OC_User::setUserId($this->user2);
                $this->assertEquals(array('test.txt'), OCP\Share::getItemSharedWith('test', 'test.txt', Test_Share_Backend::FORMAT_SOURCE));
                OC_User::setUserId($this->user3);
                $this->assertEquals(array('test.txt'), OCP\Share::getItemSharedWith('test', 'test.txt', Test_Share_Backend::FORMAT_SOURCE));
-               
+
                // Attempt to share again
                OC_User::setUserId($this->user1);
                $message = 'Sharing test.txt failed, because this item is already shared with '.$this->group1;
                try {
-                       OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_GROUP, $this->group1, OCP\Share::PERMISSION_READ);
+                       OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_GROUP, $this->group1, OCP\PERMISSION_READ);
                        $this->fail('Exception was expected: '.$message);
                } catch (Exception $exception) {
                        $this->assertEquals($message, $exception->getMessage());
                }
-               
+
                // Attempt to share back to owner of group share
                OC_User::setUserId($this->user2);
                $message = 'Sharing test.txt failed, because the user '.$this->user1.' is the original sharer';
                try {
-                       OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user1, OCP\Share::PERMISSION_READ);
+                       OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user1, OCP\PERMISSION_READ);
                        $this->fail('Exception was expected: '.$message);
                } catch (Exception $exception) {
                        $this->assertEquals($message, $exception->getMessage());
                }
-               
+
                // Attempt to share back to group
                $message = 'Sharing test.txt failed, because this item is already shared with '.$this->group1;
                try {
-                       OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_GROUP, $this->group1, OCP\Share::PERMISSION_READ);
+                       OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_GROUP, $this->group1, OCP\PERMISSION_READ);
                        $this->fail('Exception was expected: '.$message);
                } catch (Exception $exception) {
                        $this->assertEquals($message, $exception->getMessage());
                }
-               
+
                // Attempt to share back to member of group
                $message ='Sharing test.txt failed, because this item is already shared with '.$this->user3;
                try {
-                       OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user3, OCP\Share::PERMISSION_READ);
+                       OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user3, OCP\PERMISSION_READ);
                        $this->fail('Exception was expected: '.$message);
                } catch (Exception $exception) {
                        $this->assertEquals($message, $exception->getMessage());
                }
-               
+
                // Unshare
                OC_User::setUserId($this->user1);
                $this->assertTrue(OCP\Share::unshare('test', 'test.txt', OCP\Share::SHARE_TYPE_GROUP, $this->group1));
-               
+
                // Valid share with same person - user then group
-               $this->assertTrue(OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user2, OCP\Share::PERMISSION_READ | OCP\Share::PERMISSION_DELETE | OCP\Share::PERMISSION_SHARE));
-               $this->assertTrue(OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_GROUP, $this->group1, OCP\Share::PERMISSION_READ | OCP\Share::PERMISSION_UPDATE));
+               $this->assertTrue(OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user2, OCP\PERMISSION_READ | OCP\PERMISSION_DELETE | OCP\PERMISSION_SHARE));
+               $this->assertTrue(OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_GROUP, $this->group1, OCP\PERMISSION_READ | OCP\PERMISSION_UPDATE));
                OC_User::setUserId($this->user2);
                $this->assertEquals(array('test.txt'), OCP\Share::getItemsSharedWith('test', Test_Share_Backend::FORMAT_TARGET));
-               $this->assertEquals(array(OCP\Share::PERMISSION_READ | OCP\Share::PERMISSION_UPDATE | OCP\Share::PERMISSION_DELETE | OCP\Share::PERMISSION_SHARE), OCP\Share::getItemSharedWith('test', 'test.txt', Test_Share_Backend::FORMAT_PERMISSIONS));
+               $this->assertEquals(array(OCP\PERMISSION_READ | OCP\PERMISSION_UPDATE | OCP\PERMISSION_DELETE | OCP\PERMISSION_SHARE), OCP\Share::getItemSharedWith('test', 'test.txt', Test_Share_Backend::FORMAT_PERMISSIONS));
                OC_User::setUserId($this->user3);
                $this->assertEquals(array('test.txt'), OCP\Share::getItemsSharedWith('test', Test_Share_Backend::FORMAT_TARGET));
-               $this->assertEquals(array(OCP\Share::PERMISSION_READ | OCP\Share::PERMISSION_UPDATE), OCP\Share::getItemSharedWith('test', 'test.txt', Test_Share_Backend::FORMAT_PERMISSIONS));
-               
+               $this->assertEquals(array(OCP\PERMISSION_READ | OCP\PERMISSION_UPDATE), OCP\Share::getItemSharedWith('test', 'test.txt', Test_Share_Backend::FORMAT_PERMISSIONS));
+
                // Valid reshare
                OC_User::setUserId($this->user2);
-               $this->assertTrue(OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user4, OCP\Share::PERMISSION_READ));
+               $this->assertTrue(OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user4, OCP\PERMISSION_READ));
                OC_User::setUserId($this->user4);
                $this->assertEquals(array('test.txt'), OCP\Share::getItemsSharedWith('test', Test_Share_Backend::FORMAT_TARGET));
-               
+
                // Unshare from user only
                OC_User::setUserId($this->user1);
                $this->assertTrue(OCP\Share::unshare('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user2));
                OC_User::setUserId($this->user2);
-               $this->assertEquals(array(OCP\Share::PERMISSION_READ | OCP\Share::PERMISSION_UPDATE), OCP\Share::getItemSharedWith('test', 'test.txt', Test_Share_Backend::FORMAT_PERMISSIONS));
+               $this->assertEquals(array(OCP\PERMISSION_READ | OCP\PERMISSION_UPDATE), OCP\Share::getItemSharedWith('test', 'test.txt', Test_Share_Backend::FORMAT_PERMISSIONS));
                OC_User::setUserId($this->user4);
                $this->assertEquals(array(), OCP\Share::getItemsSharedWith('test', Test_Share_Backend::FORMAT_TARGET));
-               
+
                // Valid share with same person - group then user
                OC_User::setUserId($this->user1);
-               $this->assertTrue(OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user2, OCP\Share::PERMISSION_READ | OCP\Share::PERMISSION_DELETE));
+               $this->assertTrue(OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user2, OCP\PERMISSION_READ | OCP\PERMISSION_DELETE));
                OC_User::setUserId($this->user2);
                $this->assertEquals(array('test.txt'), OCP\Share::getItemsSharedWith('test', Test_Share_Backend::FORMAT_TARGET));
-               $this->assertEquals(array(OCP\Share::PERMISSION_READ | OCP\Share::PERMISSION_UPDATE | OCP\Share::PERMISSION_DELETE), OCP\Share::getItemSharedWith('test', 'test.txt', Test_Share_Backend::FORMAT_PERMISSIONS));
-               
+               $this->assertEquals(array(OCP\PERMISSION_READ | OCP\PERMISSION_UPDATE | OCP\PERMISSION_DELETE), OCP\Share::getItemSharedWith('test', 'test.txt', Test_Share_Backend::FORMAT_PERMISSIONS));
+
                // Unshare from group only
                OC_User::setUserId($this->user1);
                $this->assertTrue(OCP\Share::unshare('test', 'test.txt', OCP\Share::SHARE_TYPE_GROUP, $this->group1));
                OC_User::setUserId($this->user2);
-               $this->assertEquals(array(OCP\Share::PERMISSION_READ | OCP\Share::PERMISSION_DELETE), OCP\Share::getItemSharedWith('test', 'test.txt', Test_Share_Backend::FORMAT_PERMISSIONS));
-               
+               $this->assertEquals(array(OCP\PERMISSION_READ | OCP\PERMISSION_DELETE), OCP\Share::getItemSharedWith('test', 'test.txt', Test_Share_Backend::FORMAT_PERMISSIONS));
+
                // Attempt user specific target conflict
                OC_User::setUserId($this->user3);
-               $this->assertTrue(OCP\Share::shareItem('test', 'share.txt', OCP\Share::SHARE_TYPE_GROUP, $this->group1, OCP\Share::PERMISSION_READ | OCP\Share::PERMISSION_SHARE));
+               $this->assertTrue(OCP\Share::shareItem('test', 'share.txt', OCP\Share::SHARE_TYPE_GROUP, $this->group1, OCP\PERMISSION_READ | OCP\PERMISSION_SHARE));
                OC_User::setUserId($this->user2);
                $to_test = OCP\Share::getItemsSharedWith('test', Test_Share_Backend::FORMAT_TARGET);
                $this->assertEquals(2, count($to_test));
                $this->assertTrue(in_array('test.txt', $to_test));
                $this->assertTrue(in_array('test1.txt', $to_test));
-               
+
                // Valid reshare
-               $this->assertTrue(OCP\Share::shareItem('test', 'share.txt', OCP\Share::SHARE_TYPE_USER, $this->user4, OCP\Share::PERMISSION_READ | OCP\Share::PERMISSION_SHARE));
+               $this->assertTrue(OCP\Share::shareItem('test', 'share.txt', OCP\Share::SHARE_TYPE_USER, $this->user4, OCP\PERMISSION_READ | OCP\PERMISSION_SHARE));
                OC_User::setUserId($this->user4);
                $this->assertEquals(array('test1.txt'), OCP\Share::getItemsSharedWith('test', Test_Share_Backend::FORMAT_TARGET));
-               
+
                // Remove user from group
                OC_Group::removeFromGroup($this->user2, $this->group1);
                OC_User::setUserId($this->user2);
                $this->assertEquals(array('test.txt'), OCP\Share::getItemsSharedWith('test', Test_Share_Backend::FORMAT_TARGET));
                OC_User::setUserId($this->user4);
                $this->assertEquals(array(), OCP\Share::getItemsSharedWith('test', Test_Share_Backend::FORMAT_TARGET));
-               
+
                // Add user to group
                OC_Group::addToGroup($this->user4, $this->group1);
                $this->assertEquals(array('test.txt'), OCP\Share::getItemsSharedWith('test', Test_Share_Backend::FORMAT_TARGET));
-               
+
                // Unshare from self
                $this->assertTrue(OCP\Share::unshareFromSelf('test', 'test.txt'));
                $this->assertEquals(array(), OCP\Share::getItemsSharedWith('test', Test_Share_Backend::FORMAT_TARGET));
                OC_User::setUserId($this->user2);
                $this->assertEquals(array('test.txt'), OCP\Share::getItemsSharedWith('test', Test_Share_Backend::FORMAT_TARGET));
-               
+
                // Remove group
                OC_Group::deleteGroup($this->group1);
                OC_User::setUserId($this->user4);