diff options
| -rw-r--r-- | apps/files_sharing/appinfo/app.php | 2 | ||||
| -rw-r--r-- | core/ajax/share.php | 51 | ||||
| -rw-r--r-- | core/js/share.js | 123 | ||||
| -rw-r--r-- | lib/public/share.php | 30 |
4 files changed, 107 insertions, 99 deletions
diff --git a/apps/files_sharing/appinfo/app.php b/apps/files_sharing/appinfo/app.php index bbb753d5e69..d51a4f51642 100644 --- a/apps/files_sharing/appinfo/app.php +++ b/apps/files_sharing/appinfo/app.php @@ -17,7 +17,7 @@ OCP\Util::connectHook('OC_User', 'post_removeFromGroup', 'OC_Share', 'removeFrom $dir = isset($_GET['dir']) ? $_GET['dir'] : '/'; if ($dir != '/Shared' || OCP\Config::getAppValue('files_sharing', 'resharing', 'yes') == 'yes') { - OCP\Util::addscript("files_sharing", "share"); + OCP\Util::addScript('core', 'share'); } OCP\Util::addscript("3rdparty", "chosen/chosen.jquery.min"); OCP\Util::addStyle( 'files_sharing', 'sharing' ); diff --git a/core/ajax/share.php b/core/ajax/share.php index f87c12dbb59..11fee4a000b 100644 --- a/core/ajax/share.php +++ b/core/ajax/share.php @@ -20,23 +20,40 @@ */ OCP\JSON::checkLoggedIn(); -switch ($_POST['action']) { - case 'share': - $return = OCP\Share::share($_POST['itemType'], $_POST['item'], $_POST['shareType'], $_POST['shareWith'], $_POST['permissions']); - ($return) ? OCP\JSON::success() : OCP\JSON::error(); - break; - case 'unshare': - $return = OCP\Share::unshare($_POST['itemType'], $_POST['item'], $_POST['shareType'], $_POST['shareWith']); - ($return) ? OCP\JSON::success() : OCP\JSON::error(); - break; - case 'setTarget': - $return = OCP\Share::setTarget($_POST['itemType'], $_POST['item'], $_POST['newTarget']); - ($return) ? OCP\JSON::success() : OCP\JSON::error(); - break; - case 'setPermissions': - $return = OCP\Share::setPermissions($_POST['itemType'], $_POST['item'], $_POST['shareType'], $_POST['shareWith'], $_POST['permissions']); - ($return) ? OCP\JSON::success() : OCP\JSON::error(); - break; +if (isset($_POST['action'])) { + switch ($_POST['action']) { + case 'share': + $return = OCP\Share::share($_POST['itemType'], $_POST['item'], $_POST['shareType'], $_POST['shareWith'], $_POST['permissions']); + // TODO May need to return private link + ($return) ? OCP\JSON::success() : OCP\JSON::error(); + break; + case 'unshare': + $return = OCP\Share::unshare($_POST['itemType'], $_POST['item'], $_POST['shareType'], $_POST['shareWith']); + ($return) ? OCP\JSON::success() : OCP\JSON::error(); + break; + case 'setTarget': + $return = OCP\Share::setTarget($_POST['itemType'], $_POST['item'], $_POST['newTarget']); + ($return) ? OCP\JSON::success() : OCP\JSON::error(); + break; + case 'setPermissions': + $return = OCP\Share::setPermissions($_POST['itemType'], $_POST['item'], $_POST['shareType'], $_POST['shareWith'], $_POST['permissions']); + ($return) ? OCP\JSON::success() : OCP\JSON::error(); + break; + } +} else if (isset($_GET['fetch'])) { + switch ($_GET['fetch']) { + case 'getItemsSharedStatuses': + $return = OCP\Share::getItemsSharedStatuses($_POST['itemType']); + ($return) ? OCP\JSON::success(array('data' => $return)) : OCP\JSON::error(); + break; + case 'getItemShared': + $return = OCP\Share::getItemShared($_POST['itemType'], $_POST['item']); + ($return) ? OCP\JSON::success(array('data' => $return)) : OCP\JSON::error(); + break; + case 'getShareWith': + // TODO Autocomplete for all users, groups, etc. + break; + } } ?>
\ No newline at end of file diff --git a/core/js/share.js b/core/js/share.js index 5f695774ce1..9ba35616a47 100644 --- a/core/js/share.js +++ b/core/js/share.js @@ -1,35 +1,34 @@ OC.Share={ - icons:[], - itemUsers:[], - itemGroups:[], - itemPrivateLink:false, - usersAndGroups:[], - loadIcons:function() { - // Cache all icons for shared files - $.getJSON(OC.filePath('core', 'ajax', 'share.php'), function(result) { + item:[], + statuses:[], + loadIcons:function(itemType) { + // Load all share icons + $.get(OC.filePath('core', 'ajax', 'share.php'), { fetch: 'getItemsSharedStatuses', itemType: itemType }, function(result) { if (result && result.status === 'success') { $.each(result.data, function(item, hasPrivateLink) { - if (hasPrivateLink) { - OC.Share.icons[item] = OC.imagePath('core', 'actions/public'); + // Private links override shared in terms of icon display + if (itemType == 'file') { + OC.Share.statuses[item] = hasPrivateLink; } else { - OC.Share.icons[item] = OC.imagePath('core', 'actions/shared'); + if (hasPrivateLink) { + $('.share').find('[data-item="'+item+'"]').attr('src', OC.imagePath('core', 'actions/public')); + } else { + $('.share').find('[data-item="'+item+'"]').attr('src', OC.imagePath('core', 'actions/shared')); + } } }); } }); }, - loadItem:function(item) { - $.ajax({type: 'GET', url: OC.filePath('core', 'ajax', 'share.php'), data: { item: item }, async: false, success: function(result) { + loadItem:function(itemType, item) { + $.get(OC.filePath('core', 'ajax', 'share.php'), { fetch: 'getItemShared', itemType: itemType, item: item }, async: false, function(result) { if (result && result.status === 'success') { - var item = result.data; - OC.Share.itemUsers = item.users; - OC.Share.itemGroups = item.groups; - OC.Share.itemPrivateLink = item.privateLink; + OC.Share.item = result.data; } }}); }, - share:function(source, uid_shared_with, permissions, callback) { - $.post(OC.filePath('core', 'ajax', 'share.php'), { sources: source, uid_shared_with: uid_shared_with, permissions: permissions }, function(result) { + share:function(itemType, shareType, shareWith, permissions, callback) { + $.post(OC.filePath('core', 'ajax', 'share.php'), { action: 'share', itemType: itemType, shareType: shareType, shareWith: shareWith, permissions: permissions }, function(result) { if (result && result.status === 'success') { if (callback) { callback(result.data); @@ -39,8 +38,8 @@ OC.Share={ } }); }, - unshare:function(source, uid_shared_with, callback) { - $.post(OC.filePath('core', 'ajax', 'share.php'), { source: source, uid_shared_with: uid_shared_with }, function(result) { + unshare:function(itemType, shareType, shareWith, callback) { + $.post(OC.filePath('core', 'ajax', 'share.php'), { action: 'unshare', itemType: itemType, shareType: shareType, shareWith: shareWith }, function(result) { if (result && result.status === 'success') { if (callback) { callback(); @@ -50,16 +49,17 @@ OC.Share={ } }); }, - setPermissions:function(source, uid_shared_with, permissions) { - $.post(OC.filePath('core', 'ajax', 'share.php'), { source: source, uid_shared_with: uid_shared_with, permissions: permissions }, function(result) { + setPermissions:function(itemType, item, shareType, shareWith, permissions) { + $.post(OC.filePath('core', 'ajax', 'share.php'), { action: 'setPermissions', itemType: itemType, item: item, shareType: shareType, shareWith: shareWith, permissions: permissions }, function(result) { if (!result || result.status !== 'success') { OC.dialogs.alert('Error', 'Error while changing permissions'); } }); }, - showDropDown:function(item, appendTo) { + showDropDown:function(itemType, item, appendTo) { OC.Share.loadItem(item); var html = '<div id="dropdown" class="drop" data-item="'+item+'">'; + // TODO replace with autocomplete textbox html += '<select data-placeholder="User or Group" id="share_with" class="chzen-select">'; html += '<option value="" selected="selected" disabled="disabled">Your groups & members</option>'; html += '</select>'; @@ -81,43 +81,6 @@ OC.Share={ html += '</form>'; html += '</div>'; $(html).appendTo(appendTo); - if (OC.Share.usersAndGroups.length < 1) { - $.ajax({type: 'GET', url: OC.filePath('files_sharing', 'ajax', 'userautocomplete.php'), async: false, success: function(users) { - if (users) { - OC.Share.usersAndGroups = users; - $.each(users, function(index, user) { - $(user).appendTo('#share_with'); - }); - $('#share_with').trigger('liszt:updated'); - } - }}); - } else { - $.each(OC.Share.usersAndGroups, function(index, user) { - $(user).appendTo('#share_with'); - }); - $('#share_with').trigger('liszt:updated'); - } - if (OC.Share.itemUsers) { - $.each(OC.Share.itemUsers, function(index, user) { - if (user.parentFolder) { - OC.Share.addSharedWith(user.uid, user.permissions, false, user.parentFolder); - } else { - OC.Share.addSharedWith(user.uid, user.permissions, false, false); - } - }); - } - if (OC.Share.itemGroups) { - $.each(OC.Share.itemGroups, function(index, group) { - if (group.parentFolder) { - OC.Share.addSharedWith(group.gid, group.permissions, group.users, group.parentFolder); - } else { - OC.Share.addSharedWith(group.gid, group.permissions, group.users, false); - } - }); - } - if (OC.Share.itemPrivateLink) { - OC.Share.showPrivateLink(item, OC.Share.itemPrivateLink); - } $('#dropdown').show('blind'); $('#share_with').chosen(); }, @@ -215,49 +178,57 @@ OC.Share={ $(document).ready(function() { + $('.share').live('click', function() { + if ($(this).data('itemType') !== undefined && $(this).data('item') !== undefined) { + OC.Share.showDropDown($(this).data('itemType'), $(this).data('item'), $(this)); + } + }); + if (typeof FileActions !== 'undefined') { - OC.Share.loadIcons(); + OC.Share.loadIcons('file'); FileActions.register('all', 'Share', function(filename) { // Return the correct sharing icon if (scanFiles.scanning) { return; } // workaround to prevent additional http request block scanning feedback var item = $('#dir').val() + '/' + filename; - // Check if icon is in cache - if (OC.Share.icons[item]) { - return OC.Share.icons[item]; + // Check if status is in cache + if (OC.Share.statuses[item] === true) { + return OC.imagePath('core', 'actions/public'); + } else if (OC.Share.statuses[item] === false) { + return OC.imagePath('core', 'actions/shared'); } else { var last = ''; var path = OC.Share.dirname(item); // Search for possible parent folders that are shared while (path != last) { - if (OC.Share.icons[path]) { - OC.Share.icons[item] = OC.Share.icons[path]; - return OC.Share.icons[item]; + if (OC.Share.statuses[path] === true) { + return OC.imagePath('core', 'actions/public'); + } else if (OC.Share.statuses[path] === false) { + return OC.imagePath('core', 'actions/shared'); } last = path; path = OC.Share.dirname(path); } - OC.Share.icons[item] = OC.imagePath('core', 'actions/share'); - return OC.Share.icons[item]; + return OC.imagePath('core', 'actions/share'); } }, function(filename) { - var file = $('#dir').val() + '/' + filename; + var item = $('#dir').val() + '/' + filename; var appendTo = $('tr').filterAttr('data-file',filename).find('td.filename'); // Check if drop down is already visible for a different file if (($('#dropdown').length > 0)) { - if (file != $('#dropdown').data('item')) { + if (item != $('#dropdown').data('item')) { OC.Share.hideDropDown(function () { $('tr').removeClass('mouseOver'); - $('tr').filterAttr('data-file',filename).addClass('mouseOver'); - OC.Share.showDropDown(file, appendTo); + $('tr').filterAttr('data-file', filename).addClass('mouseOver'); + OC.Share.showDropDown('file', item, appendTo); }); } } else { $('tr').filterAttr('data-file',filename).addClass('mouseOver'); - OC.Share.showDropDown(file, appendTo); + OC.Share.showDropDown('file', item, appendTo); } }); }; - + $(this).click(function(event) { if (!($(event.target).hasClass('drop')) && $(event.target).parents().index($('#dropdown')) == -1) { if ($('#dropdown').is(':visible')) { diff --git a/lib/public/share.php b/lib/public/share.php index f4a11a170ac..b77a986f441 100644 --- a/lib/public/share.php +++ b/lib/public/share.php @@ -30,8 +30,7 @@ class Share { const SHARE_TYPE_USER = 0; const SHARE_TYPE_GROUP = 1; - const SHARETYPE_CONTACT = 2; - const SHARETYPE_PRIVATE_LINK = 4; + const SHARE_TYPE_PRIVATE_LINK = 3; const PERMISSION_READ = 0; const PERMISSION_UPDATE = 1; @@ -39,9 +38,10 @@ class Share { const PERMISSION_SHARE = 3; const FORMAT_NONE = -1; + const FORMAT_STATUSES = -2; private static $shareTypeUserAndGroups = -1; - private static $shareTypeGroupUserUnique = 3; + private static $shareTypeGroupUserUnique = 2; private static $backends = array(); /** @@ -95,7 +95,7 @@ class Share { * @param int Number of items to return (optional) Returns all by default * @return Return depends on format */ - public static function getItemsOwned($itemType, $format = self::FORMAT_NONE, $limit = -1) { + public static function getItemsShared($itemType, $format = self::FORMAT_NONE, $limit = -1) { return self::getItems($itemType, null, null, null, \OC_User::getUser(), $format, $limit); } @@ -106,11 +106,21 @@ class Share { * @param int Format (optional) Format type must be defined by the backend * @return Return depends on format */ - public static function getItemOwned($itemType, $item, $format = self::FORMAT_NONE) { + public static function getItemShared($itemType, $item, $format = self::FORMAT_NONE) { return self::getItems($itemType, $item, null, null, \OC_User::getUser(), $format, 1); } /** + * @brief Get the status of each shared item of item type owned by the current user + * @param string Item type + * @param int Number of items to return (optional) Returns all by default + * @return array, item as key with a value of true if item has a private link or false + */ + public static function getItemsSharedStatuses($itemType, $limit = -1) { + return self::getItems($itemType, null, null, null, \OC_User::getUser(), self::FORMAT_STATUSES, $limit); + } + + /** * @brief Share an item with a user, group, or via private link * @param string Item type * @param string Item @@ -455,6 +465,16 @@ class Share { return $items[key($items)]; } return $items; + } else if ($format == self::FORMAT_STATUSES) { + $statuses = array(); + foreach ($items as $item) { + if ($item['shareType'] == self::SHARE_TYPE_PRIVATE_LINK) { + $statuses[$item['item']] = true; + } else if (!isset($statuses[$item['item']])) { + $statuses[$items['item']] = false; + } + } + return $statuses; } else { return $backend->formatItems($items, $format); } |