diff --git a/core/js/share.js b/core/js/share.js
index 01467b495f21d29a8ffda404c1c38ecab5ac7590..0a3bba49b6c2bafd63570df0b9f7c260756f57a0 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -405,272 +405,6 @@ OC.Share = _.extend(OC.Share, {
OC.Share.droppedDown = true;
});
itemModel.fetch();
- return;
-
-
- var data = OC.Share.loadItem(itemType, itemSource);
- var dropDownEl;
- var html = '<div id="dropdown" class="drop shareDropDown" data-item-type="'+itemType+'" data-item-source="'+itemSource+'">';
- if (data !== false && data.reshare !== false && data.reshare.uid_owner !== undefined && data.reshare.uid_owner !== OC.currentUser) {
- html += '<span class="reshare">';
- if (oc_config.enable_avatars === true) {
- html += '<div class="avatar"></div> ';
- }
-
- if (data.reshare.share_type == OC.Share.SHARE_TYPE_GROUP) {
- html += t('core', 'Shared with you and the group {group} by {owner}', {group: data.reshare.share_with, owner: data.reshare.displayname_owner});
- } else {
- html += t('core', 'Shared with you by {owner}', {owner: data.reshare.displayname_owner});
- }
- html += '</span><br />';
- // reduce possible permissions to what the original share allowed
- possiblePermissions = possiblePermissions & data.reshare.permissions;
- }
-
- if (possiblePermissions & OC.PERMISSION_SHARE) {
- // Determine the Allow Public Upload status.
- // Used later on to determine if the
- // respective checkbox should be checked or
- // not.
-
- var publicUploadEnabled = $('#filestable').data('allow-public-upload');
- if (typeof publicUploadEnabled == 'undefined') {
- publicUploadEnabled = 'no';
- }
- var allowPublicUploadStatus = false;
-
- $.each(data.shares, function(key, value) {
- if (value.share_type === OC.Share.SHARE_TYPE_LINK) {
- allowPublicUploadStatus = (value.permissions & OC.PERMISSION_CREATE) ? true : false;
- return true;
- }
- });
-
- var sharePlaceholder = t('core', 'Share with users or groups …');
- if(oc_appconfig.core.remoteShareAllowed) {
- sharePlaceholder = t('core', 'Share with users, groups or remote users …');
- }
-
- html += '<label for="shareWith" class="hidden-visually">'+t('core', 'Share')+'</label>';
- html += '<input id="shareWith" type="text" placeholder="' + sharePlaceholder + '" />';
- if(oc_appconfig.core.remoteShareAllowed) {
- var federatedCloudSharingDoc = '<a target="_blank" class="icon-info svg shareWithRemoteInfo" href="{docLink}" '
- + 'title="' + t('core', 'Share with people on other ownClouds using the syntax username@example.com/owncloud') + '"></a>';
- html += federatedCloudSharingDoc.replace('{docLink}', oc_appconfig.core.federatedCloudShareDoc);
- }
- html += '<span class="shareWithLoading icon-loading-small hidden"></span>';
- html += '<ul id="shareWithList">';
- html += '</ul>';
- var linksAllowed = $('#allowShareWithLink').val() === 'yes';
- if (link && linksAllowed) {
- html += '<div id="link" class="linkShare">';
- html += '<span class="icon-loading-small hidden"></span>';
- html += '<input type="checkbox" name="linkCheckbox" id="linkCheckbox" value="1" /><label for="linkCheckbox">'+t('core', 'Share link')+'</label>';
- html += '<br />';
-
- var defaultExpireMessage = '';
- if ((itemType === 'folder' || itemType === 'file') && oc_appconfig.core.defaultExpireDateEnforced) {
- defaultExpireMessage = t('core', 'The public link will expire no later than {days} days after it is created', {'days': oc_appconfig.core.defaultExpireDate}) + '<br/>';
- }
-
- html += '<label for="linkText" class="hidden-visually">'+t('core', 'Link')+'</label>';
- html += '<input id="linkText" type="text" readonly="readonly" />';
- html += '<input type="checkbox" name="showPassword" id="showPassword" value="1" style="display:none;" /><label for="showPassword" style="display:none;">'+t('core', 'Password protect')+'</label>';
- html += '<div id="linkPass">';
- html += '<label for="linkPassText" class="hidden-visually">'+t('core', 'Password')+'</label>';
- html += '<input id="linkPassText" type="password" placeholder="'+t('core', 'Choose a password for the public link')+'" />';
- html += '<span class="icon-loading-small hidden"></span>';
- html += '</div>';
-
- if (itemType === 'folder' && (possiblePermissions & OC.PERMISSION_CREATE) && publicUploadEnabled === 'yes') {
- html += '<div id="allowPublicUploadWrapper" style="display:none;">';
- html += '<span class="icon-loading-small hidden"></span>';
- html += '<input type="checkbox" value="1" name="allowPublicUpload" id="sharingDialogAllowPublicUpload"' + ((allowPublicUploadStatus) ? 'checked="checked"' : '') + ' />';
- html += '<label for="sharingDialogAllowPublicUpload">' + t('core', 'Allow editing') + '</label>';
- html += '</div>';
- }
- html += '</div>';
- var mailPublicNotificationEnabled = $('input:hidden[name=mailPublicNotificationEnabled]').val();
- if (mailPublicNotificationEnabled === 'yes') {
- html += '<form id="emailPrivateLink">';
- html += '<input id="email" style="display:none; width:62%;" value="" placeholder="'+t('core', 'Email link to person')+'" type="text" />';
- html += '<input id="emailButton" style="display:none;" type="submit" value="'+t('core', 'Send')+'" />';
- html += '</form>';
- }
- }
-
- html += '<div id="expiration">';
- html += '<input type="checkbox" name="expirationCheckbox" id="expirationCheckbox" value="1" /><label for="expirationCheckbox">'+t('core', 'Set expiration date')+'</label>';
- html += '<label for="expirationDate" class="hidden-visually">'+t('core', 'Expiration')+'</label>';
- html += '<input id="expirationDate" type="text" placeholder="'+t('core', 'Expiration date')+'" style="display:none; width:90%;" />';
- html += '<em id="defaultExpireMessage">'+defaultExpireMessage+'</em>';
- html += '</div>';
- dropDownEl = $(html);
- dropDownEl = dropDownEl.appendTo(appendTo);
-
- // trigger remote share info tooltip
- if(oc_appconfig.core.remoteShareAllowed) {
- $('.shareWithRemoteInfo').tipsy({gravity: 'e'});
- }
-
- //Get owner avatars
- if (oc_config.enable_avatars === true && data !== false && data.reshare !== false && data.reshare.uid_owner !== undefined) {
- dropDownEl.find(".avatar").avatar(data.reshare.uid_owner, 32);
- }
-
- // Reset item shares
- OC.Share.itemShares = [];
- OC.Share.currentShares = {};
- if (data.shares) {
- $.each(data.shares, function(index, share) {
- if (share.share_type == OC.Share.SHARE_TYPE_LINK) {
- if (itemSource === share.file_source || itemSource === share.item_source) {
- OC.Share.showLink(share.token, share.share_with, itemSource);
- }
- } else {
- if (share.collection) {
- OC.Share.addShareWith(share.share_type, share.share_with, share.share_with_displayname, share.permissions, possiblePermissions, share.mail_send, share.collection);
- } else {
- if (share.share_type === OC.Share.SHARE_TYPE_REMOTE) {
- OC.Share.addShareWith(share.share_type, share.share_with, share.share_with_displayname, share.permissions, OC.PERMISSION_READ | OC.PERMISSION_UPDATE | OC.PERMISSION_CREATE, share.mail_send, false);
- } else {
- OC.Share.addShareWith(share.share_type, share.share_with, share.share_with_displayname, share.permissions, possiblePermissions, share.mail_send, false);
- }
- }
- }
- if (share.expiration != null) {
- OC.Share.showExpirationDate(share.expiration, share.stime);
- }
- });
- }
- $('#shareWith').autocomplete({minLength: 2, delay: 750, source: function(search, response) {
- var $loading = $('#dropdown .shareWithLoading');
- $loading.removeClass('hidden');
- $.get(OC.filePath('core', 'ajax', 'share.php'), { fetch: 'getShareWith', search: search.term.trim(), limit: 200, itemShares: OC.Share.itemShares, itemType: itemType }, function(result) {
- $loading.addClass('hidden');
- if (result.status == 'success' && result.data.length > 0) {
- $( "#shareWith" ).autocomplete( "option", "autoFocus", true );
- response(result.data);
- } else {
- response();
- }
- }).fail(function(){
- $('#dropdown').find('.shareWithLoading').addClass('hidden');
- OC.Notification.show(t('core', 'An error occured. Please try again'));
- window.setTimeout(OC.Notification.hide, 5000);
- });
- },
- focus: function(event, focused) {
- event.preventDefault();
- },
- select: function(event, selected) {
- event.stopPropagation();
- var $dropDown = $('#dropdown');
- var itemType = $dropDown.data('item-type');
- var itemSource = $dropDown.data('item-source');
- var itemSourceName = $dropDown.data('item-source-name');
- var expirationDate = '';
- if ( $('#expirationCheckbox').is(':checked') === true ) {
- expirationDate = $( "#expirationDate" ).val();
- }
- var shareType = selected.item.value.shareType;
- var shareWith = selected.item.value.shareWith;
- $(this).val(shareWith);
- // Default permissions are Edit (CRUD) and Share
- // Check if these permissions are possible
- var permissions = OC.PERMISSION_READ;
- if (shareType === OC.Share.SHARE_TYPE_REMOTE) {
- permissions = OC.PERMISSION_CREATE | OC.PERMISSION_UPDATE | OC.PERMISSION_READ;
- } else {
- if (possiblePermissions & OC.PERMISSION_UPDATE) {
- permissions = permissions | OC.PERMISSION_UPDATE;
- }
- if (possiblePermissions & OC.PERMISSION_CREATE) {
- permissions = permissions | OC.PERMISSION_CREATE;
- }
- if (possiblePermissions & OC.PERMISSION_DELETE) {
- permissions = permissions | OC.PERMISSION_DELETE;
- }
- if (oc_appconfig.core.resharingAllowed && (possiblePermissions & OC.PERMISSION_SHARE)) {
- permissions = permissions | OC.PERMISSION_SHARE;
- }
- }
-
- var $input = $(this);
- var $loading = $dropDown.find('.shareWithLoading');
- $loading.removeClass('hidden');
- $input.val(t('core', 'Adding user...'));
- $input.prop('disabled', true);
-
- OC.Share.share(itemType, itemSource, shareType, shareWith, permissions, itemSourceName, expirationDate, function() {
- $input.prop('disabled', false);
- $loading.addClass('hidden');
- var posPermissions = possiblePermissions;
- if (shareType === OC.Share.SHARE_TYPE_REMOTE) {
- posPermissions = permissions;
- }
- OC.Share.addShareWith(shareType, shareWith, selected.item.label, permissions, posPermissions);
- $('#shareWith').val('');
- $('#dropdown').trigger(new $.Event('sharesChanged', {shares: OC.Share.currentShares}));
- OC.Share.updateIcon(itemType, itemSource);
- });
- return false;
- }
- })
- // customize internal _renderItem function to display groups and users differently
- .data("ui-autocomplete")._renderItem = function( ul, item ) {
- var insert = $( "<a>" );
- var text = item.label;
- if (item.value.shareType === OC.Share.SHARE_TYPE_GROUP) {
- text = text + ' ('+t('core', 'group')+')';
- } else if (item.value.shareType === OC.Share.SHARE_TYPE_REMOTE) {
- text = text + ' ('+t('core', 'remote')+')';
- }
- insert.text( text );
- if(item.value.shareType === OC.Share.SHARE_TYPE_GROUP) {
- insert = insert.wrapInner('<strong></strong>');
- }
- return $( "<li>" )
- .addClass((item.value.shareType === OC.Share.SHARE_TYPE_GROUP)?'group':'user')
- .append( insert )
- .appendTo( ul );
- };
- if (link && linksAllowed && $('#email').length != 0) {
- $('#email').autocomplete({
- minLength: 1,
- source: function (search, response) {
- $.get(OC.filePath('core', 'ajax', 'share.php'), { fetch: 'getShareWithEmail', search: search.term }, function(result) {
- if (result.status == 'success' && result.data.length > 0) {
- response(result.data);
- }
- });
- },
- select: function( event, item ) {
- $('#email').val(item.item.email);
- return false;
- }
- })
- .data("ui-autocomplete")._renderItem = function( ul, item ) {
- return $('<li>')
- .append('<a>' + escapeHTML(item.displayname) + "<br>" + escapeHTML(item.email) + '</a>' )
- .appendTo( ul );
- };
- }
-
- } else {
- html += '<input id="shareWith" type="text" placeholder="'+t('core', 'Resharing is not allowed')+'" style="width:90%;" disabled="disabled"/>';
- html += '</div>';
- dropDownEl = $(html);
- dropDownEl.appendTo(appendTo);
- }
- dropDownEl.attr('data-item-source-name', filename);
- $('#dropdown').slideDown(OC.menuSpeed, function() {
- OC.Share.droppedDown = true;
- });
- if ($('html').hasClass('lte9')){
- $('#dropdown input[placeholder]').placeholder();
- }
- $('#shareWith').focus();
},
hideDropDown:function(callback) {
OC.Share.currentShares = null;
@@ -687,66 +421,6 @@ OC.Share = _.extend(OC.Share, {
},
dirname:function(path) {
return path.replace(/\\/g,'/').replace(/\/[^\/]*$/, '');
- },
- /**
- * Parses a string to an valid integer (unix timestamp)
- * @param time
- * @returns {*}
- * @internal Only used to work around a bug in the backend
- */
- _parseTime: function(time) {
- if (_.isString(time)) {
- // skip empty strings and hex values
- if (time === '' || (time.length > 1 && time[0] === '0' && time[1] === 'x')) {
- return null;
- }
- time = parseInt(time, 10);
- if(isNaN(time)) {
- time = null;
- }
- }
- return time;
- },
- /**
- * Displays the expiration date field
- *
- * @param {Date} date current expiration date
- * @param {int} [shareTime] share timestamp in seconds, defaults to now
- */
- showExpirationDate:function(date, shareTime) {
- var now = new Date();
- // min date should always be the next day
- var minDate = new Date();
- minDate.setDate(minDate.getDate()+1);
- var datePickerOptions = {
- minDate: minDate,
- maxDate: null
- };
- // TODO: hack: backend returns string instead of integer
- shareTime = OC.Share._parseTime(shareTime);
- if (_.isNumber(shareTime)) {
- shareTime = new Date(shareTime * 1000);
- }
- if (!shareTime) {
- shareTime = now;
- }
- $('#expirationCheckbox').attr('checked', true);
- $('#expirationDate').val(date);
- $('#expirationDate').slideDown(OC.menuSpeed);
- $('#expirationDate').css('display','block');
- $('#expirationDate').datepicker({
- dateFormat : 'dd-mm-yy'
- });
- if (oc_appconfig.core.defaultExpireDateEnforced) {
- $('#expirationCheckbox').attr('disabled', true);
- shareTime = OC.Util.stripTime(shareTime).getTime();
- // max date is share date + X days
- datePickerOptions.maxDate = new Date(shareTime + oc_appconfig.core.defaultExpireDate * 24 * 3600 * 1000);
- }
- if(oc_appconfig.core.defaultExpireDateEnabled) {
- $('#defaultExpireMessage').slideDown(OC.menuSpeed);
- }
- $.datepicker.setDefaults(datePickerOptions);
}
});
@@ -776,104 +450,6 @@ $(document).ready(function() {
}
});
- $(document).on('click', '#dropdown #expirationCheckbox', function() {
- if (this.checked) {
- OC.Share.showExpirationDate('');
- } else {
- var itemType = $('#dropdown').data('item-type');
- var itemSource = $('#dropdown').data('item-source');
- $.post(OC.filePath('core', 'ajax', 'share.php'), { action: 'setExpirationDate', itemType: itemType, itemSource: itemSource, date: '' }, function(result) {
- if (!result || result.status !== 'success') {
- OC.dialogs.alert(t('core', 'Error unsetting expiration date'), t('core', 'Error'));
- }
- $('#expirationDate').slideUp(OC.menuSpeed);
- if (oc_appconfig.core.defaultExpireDateEnforced === false) {
- $('#defaultExpireMessage').slideDown(OC.menuSpeed);
- }
- });
- }
- });
-
- $(document).on('change', '#dropdown #expirationDate', function() {
- var itemType = $('#dropdown').data('item-type');
- var itemSource = $('#dropdown').data('item-source');
-
- $(this).tipsy('hide');
- $(this).removeClass('error');
-
- $.post(OC.filePath('core', 'ajax', 'share.php'), { action: 'setExpirationDate', itemType: itemType, itemSource: itemSource, date: $(this).val() }, function(result) {
- if (!result || result.status !== 'success') {
- var expirationDateField = $('#dropdown #expirationDate');
- if (!result.data.message) {
- expirationDateField.attr('original-title', t('core', 'Error setting expiration date'));
- } else {
- expirationDateField.attr('original-title', result.data.message);
- }
- expirationDateField.tipsy({gravity: 'n'});
- expirationDateField.tipsy('show');
- expirationDateField.addClass('error');
- } else {
- if (oc_appconfig.core.defaultExpireDateEnforced === 'no') {
- $('#defaultExpireMessage').slideUp(OC.menuSpeed);
- }
- }
- });
- });
-
-
- $(document).on('submit', '#dropdown #emailPrivateLink', function(event) {
- event.preventDefault();
- var link = $('#linkText').val();
- var itemType = $('#dropdown').data('item-type');
- var itemSource = $('#dropdown').data('item-source');
- var file = $('tr').filterAttr('data-id', String(itemSource)).data('file');
- var email = $('#email').val();
- var expirationDate = '';
- if ( $('#expirationCheckbox').is(':checked') === true ) {
- expirationDate = $( "#expirationDate" ).val();
- }
- if (email != '') {
- $('#email').prop('disabled', true);
- $('#email').val(t('core', 'Sending ...'));
- $('#emailButton').prop('disabled', true);
-
- $.post(OC.filePath('core', 'ajax', 'share.php'), { action: 'email', toaddress: email, link: link, itemType: itemType, itemSource: itemSource, file: file, expiration: expirationDate},
- function(result) {
- $('#email').prop('disabled', false);
- $('#emailButton').prop('disabled', false);
- if (result && result.status == 'success') {
- $('#email').css('font-weight', 'bold').val(t('core','Email sent'));
- setTimeout(function() {
- $('#email').css('font-weight', 'normal').val('');
- }, 2000);
- } else {
- OC.dialogs.alert(result.data.message, t('core', 'Error while sharing'));
- }
- });
- }
- });
-
- $(document).on('click', '#dropdown input[name=mailNotification]', function() {
- var $li = $(this).closest('li');
- var itemType = $('#dropdown').data('item-type');
- var itemSource = $('#dropdown').data('item-source');
- var action = '';
- if (this.checked) {
- action = 'informRecipients';
- } else {
- action = 'informRecipientsDisabled';
- }
-
- var shareType = $li.data('share-type');
- var shareWith = $li.attr('data-share-with');
-
- $.post(OC.filePath('core', 'ajax', 'share.php'), {action: action, recipient: shareWith, shareType: shareType, itemSource: itemSource, itemType: itemType}, function(result) {
- if (result.status !== 'success') {
- OC.dialogs.alert(t('core', result.data.message), t('core', 'Warning'));
- }
- });
-
-});
});