'));
}
- $.get(OC.generateUrl('apps/richdocuments/wopi/token/{fileId}', { fileId: fileId }),
- function (result) {
- // WOPISrc - URL that loolwsd will access (ie. pointing to ownCloud)
- var wopiurl = window.location.protocol + '//' + window.location.host + OC.generateUrl('apps/richdocuments/wopi/files/{file_id}', {file_id: fileId});
- var wopisrc = encodeURIComponent(wopiurl);
+ // WOPISrc - URL that loolwsd will access (ie. pointing to ownCloud)
+ var wopiurl = window.location.protocol + '//' + window.location.host + OC.generateUrl('apps/richdocuments/wopi/files/{file_id}', {file_id: fileId});
+ var wopisrc = encodeURIComponent(wopiurl);
- // urlsrc - the URL from discovery xml that we access for the particular
- // document; we add various parameters to that.
- // The discovery is available at
- // https://:9980/hosting/discovery
- var urlsrc = documentsMain.urlsrc +
- "WOPISrc=" + wopisrc +
- "&title=" + encodeURIComponent(title) +
- "&lang=" + OC.getLocale() +
- "&permission=readonly";
+ // urlsrc - the URL from discovery xml that we access for the particular
+ // document; we add various parameters to that.
+ // The discovery is available at
+ // https://:9980/hosting/discovery
+ var urlsrc = documentsMain.urlsrc +
+ "WOPISrc=" + wopisrc +
+ "&title=" + encodeURIComponent(title) +
+ "&lang=" + OC.getLocale() +
+ "&permission=readonly";
- // access_token - must be passed via a form post
- var access_token = encodeURIComponent(result.token);
+ // access_token - must be passed via a form post
+ var access_token = encodeURIComponent(documentsMain.token);
- // form to post the access token for WOPISrc
- var form = '';
+ // form to post the access token for WOPISrc
+ var form = '';
- // iframe that contains the Collabora Online Viewer
- var frame = '';
+ // iframe that contains the Collabora Online Viewer
+ var frame = '';
- $('#revViewer').append(form);
- $('#revViewer').append(frame);
+ $('#revViewer').append(form);
+ $('#revViewer').append(frame);
- // submit that
- $('#loleafletform_viewer').submit();
- documentsMain.isViewerMode = true;
- });
+ // submit that
+ $('#loleafletform_viewer').submit();
+ documentsMain.isViewerMode = true;
// for closing revision mode
$('#revPanelHeader .closeButton').click(function(e) {
@@ -344,91 +312,81 @@ var documentsMain = {
$('title').text(title + ' - ' + documentsMain.UI.mainTitle);
- $.get(OC.generateUrl('apps/richdocuments/wopi/token/{fileId}', { fileId: fileId }),
- function (result) {
- if (!result || result.status === 'error') {
- if (result && result.message){
- documentsMain.UI.notify(result.message);
- }
- documentsMain.onEditorShutdown(t('richdocuments', 'Failed to aquire access token. Please re-login and try again.'));
+
+ // WOPISrc - URL that loolwsd will access (ie. pointing to ownCloud)
+ var wopiurl = window.location.protocol + '//' + window.location.host + OC.generateUrl('apps/richdocuments/wopi/files/{file_id}', {file_id: documentsMain.fileId});
+ var wopisrc = encodeURIComponent(wopiurl);
+
+ // urlsrc - the URL from discovery xml that we access for the particular
+ // document; we add various parameters to that.
+ // The discovery is available at
+ // https://:9980/hosting/discovery
+ var urlsrc = documentsMain.urlsrc +
+ "WOPISrc=" + wopisrc +
+ "&title=" + encodeURIComponent(title) +
+ "&lang=" + OC.getLocale() +
+ "&closebutton=1" +
+ "&revisionhistory=1";
+ if (!documentsMain.canEdit || action === "view") {
+ urlsrc += "&permission=readonly";
+ }
+
+ // access_token - must be passed via a form post
+ var access_token = encodeURIComponent(documentsMain.token);
+
+ // form to post the access token for WOPISrc
+ var form = '';
+
+ // iframe that contains the Collabora Online
+ var frame = '';
+
+ $('#mainContainer').append(form);
+ $('#mainContainer').append(frame);
+
+ // Listen for App_LoadingStatus as soon as possible
+ $('#loleafletframe').ready(function() {
+ var editorInitListener = function(e) {
+ var msg = JSON.parse(e.data);
+ if (msg.MessageId === 'App_LoadingStatus') {
+ window.removeEventListener('message', editorInitListener, false);
+ }
+ };
+ window.addEventListener('message', editorInitListener, false);
+ });
+
+ $('#loleafletframe').load(function(){
+ // And start listening to incoming post messages
+ window.addEventListener('message', function(e){
+ if (documentsMain.isViewerMode) {
return;
}
- // WOPISrc - URL that loolwsd will access (ie. pointing to ownCloud)
- var wopiurl = window.location.protocol + '//' + window.location.host + OC.generateUrl('apps/richdocuments/wopi/files/{file_id}', {file_id: documentsMain.fileId});
- var wopisrc = encodeURIComponent(wopiurl);
-
- // urlsrc - the URL from discovery xml that we access for the particular
- // document; we add various parameters to that.
- // The discovery is available at
- // https://:9980/hosting/discovery
- var urlsrc = documentsMain.urlsrc +
- "WOPISrc=" + wopisrc +
- "&title=" + encodeURIComponent(title) +
- "&lang=" + OC.getLocale() +
- "&closebutton=1" +
- "&revisionhistory=1";
- if (!documentsMain.canEdit || action === "view") {
- urlsrc += "&permission=readonly";
+ try {
+ var msg = JSON.parse(e.data).MessageId;
+ } catch(exc) {
+ msg = e.data;
}
+ if (msg === 'UI_Close' || msg === 'close') {
+ documentsMain.onClose();
+ } else if (msg === 'rev-history') {
+ documentsMain.UI.showRevHistory(documentsMain.fullPath);
+ }
+ });
- // access_token - must be passed via a form post
- var access_token = encodeURIComponent(result.token);
-
- // form to post the access token for WOPISrc
- var form = '';
-
- // iframe that contains the Collabora Online
- var frame = '';
-
- $('#mainContainer').append(form);
- $('#mainContainer').append(frame);
-
- // Listen for App_LoadingStatus as soon as possible
- $('#loleafletframe').ready(function() {
- var editorInitListener = function(e) {
- var msg = JSON.parse(e.data);
- if (msg.MessageId === 'App_LoadingStatus') {
- window.removeEventListener('message', editorInitListener, false);
- }
- };
- window.addEventListener('message', editorInitListener, false);
- });
-
- $('#loleafletframe').load(function(){
- // And start listening to incoming post messages
- window.addEventListener('message', function(e){
- if (documentsMain.isViewerMode) {
- return;
- }
-
- try {
- var msg = JSON.parse(e.data).MessageId;
- } catch(exc) {
- msg = e.data;
- }
- if (msg === 'UI_Close' || msg === 'close') {
- documentsMain.onClose();
- } else if (msg === 'rev-history') {
- documentsMain.UI.showRevHistory(documentsMain.fullPath);
- }
- });
-
- // Tell the LOOL iframe that we are ready now
- documentsMain.WOPIPostMessage($('#loleafletframe')[0], 'Host_PostmessageReady', {});
-
- // LOOL Iframe is ready, turn off our overlay
- // This should ideally be taken off when we receive App_LoadingStatus, but
- // for backward compatibility with older lool, lets keep it here till we decide
- // to break older lools
- documentsMain.overlay.documentOverlay('hide');
- });
-
- // submit that
- $('#loleafletform').submit();
+ // Tell the LOOL iframe that we are ready now
+ documentsMain.WOPIPostMessage($('#loleafletframe')[0], 'Host_PostmessageReady', {});
+ // LOOL Iframe is ready, turn off our overlay
+ // This should ideally be taken off when we receive App_LoadingStatus, but
+ // for backward compatibility with older lool, lets keep it here till we decide
+ // to break older lools
+ documentsMain.overlay.documentOverlay('hide');
});
+
+ // submit that
+ $('#loleafletform').submit();
+
},
hideEditor : function(){
@@ -447,16 +405,6 @@ var documentsMain = {
});
},
- showSave : function (){
- $('#odf-close').hide();
- $('#saving-document').show();
- },
-
- hideSave : function(){
- $('#saving-document').hide();
- $('#odf-close').show();
- },
-
showProgress : function(message){
if (!message){
message = ' ';
@@ -479,25 +427,12 @@ var documentsMain = {
var fileId;
documentsMain.UI.init();
- if (!OC.currentUser){
- documentsMain.isGuest = true;
+ // Does anything indicate that we need to autostart a session?
+ fileId = parent.location.hash.replace(/^\W*/, '');
- if ($("[name='document']").val()){
- $(documentsMain.toolbar).appendTo('#header');
- documentsMain.prepareSession();
- documentsMain.joinSession(
- $("[name='document']").val()
- );
- }
-
- } else {
- // Does anything indicate that we need to autostart a session?
- fileId = parent.location.hash.replace(/^\W*/, '');
-
- if (fileId.indexOf('_') >= 0) {
- documentsMain.returnToDir = unescape(fileId.replace(/^[^_]*_/, ''));
- fileId = fileId.replace(/_.*/, '');
- }
+ if (fileId.indexOf('_') >= 0) {
+ documentsMain.returnToDir = unescape(fileId.replace(/^[^_]*_/, ''));
+ fileId = fileId.replace(/_.*/, '');
}
documentsMain.show(fileId);
@@ -505,7 +440,6 @@ var documentsMain = {
if (fileId) {
documentsMain.overlay.documentOverlay('show');
documentsMain.prepareSession();
- documentsMain.joinSession(fileId);
}
documentsMain.ready = true;
@@ -530,14 +464,14 @@ var documentsMain = {
},
initSession: function(response) {
- if(response && (response.id && !response.es_id)){
- return documentsMain.view(response.id);
- }
+ documentsMain.urlsrc = response.documents[0].urlsrc;
+ documentsMain.fullPath = response.documents[0].path;
+ documentsMain.token = response.documents[0].token;
$('footer,nav').hide();
$(documentsMain.toolbar).appendTo('#header');
- if (!response || !response.status || response.status==='error'){
+ if (!response) {
documentsMain.onEditorShutdown(t('richdocuments', 'Failed to load this document. Please check if it can be opened with an external editor. This might also mean it has been unshared or deleted recently.'));
return;
}
@@ -558,9 +492,8 @@ var documentsMain = {
documentsMain.fileId = response.file_id;
documentsMain.fileName = response.title;
- documentsMain.esId = response.es_id;
documentsMain.memberId = response.member_id;
- documentsMain.canEdit = response.permissions & OC.PERMISSION_UPDATE;
+ documentsMain.canEdit = Boolean(response.permissions & OC.PERMISSION_UPDATE);
documentsMain.loadDocument(response);
@@ -571,22 +504,6 @@ var documentsMain = {
});
},
-
- joinSession: function(fileId) {
- console.log('joining session '+fileId);
- var url;
- if (documentsMain.isGuest){
- url = OC.generateUrl('apps/richdocuments/session/guest/join/{token}', {token: fileId});
- } else {
- url = OC.generateUrl('apps/richdocuments/session/user/join/{file_id}', {file_id: fileId});
- }
- $.post(
- url,
- { name : $("[name='memberName']").val() },
- documentsMain.initSession
- );
- },
-
view : function(id){
OC.addScript('richdocuments', 'viewer/viewer', function() {
$(window).off('beforeunload');
@@ -680,77 +597,6 @@ var documentsMain = {
}
};
-//init
-var Files = Files || {
- // FIXME: copy/pasted from Files.isFileNameValid, needs refactor into core
- isFileNameValid:function (name) {
- if (name === '.') {
- throw t('files', '\'.\' is an invalid file name.');
- } else if (name.length === 0) {
- throw t('files', 'File name cannot be empty.');
- }
-
- // check for invalid characters
- var invalid_characters = ['\\', '/', '<', '>', ':', '"', '|', '?', '*'];
- for (var i = 0; i < invalid_characters.length; i++) {
- if (name.indexOf(invalid_characters[i]) !== -1) {
- throw t('files', "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed.");
- }
- }
- return true;
- },
-
- updateStorageStatistics: function(){}
-},
-FileList = FileList || {};
-
-FileList.getCurrentDirectory = function(){
- return $('#dir').val() || '/';
-};
-
-FileList.highlightFiles = function(files, highlightFunction) {
-};
-
-FileList.findFile = function(filename) {
- var documents = documentsMain.docs.documentGrid('option').documents;
- return _.find(documents, function(aFile) {
- return (aFile.name === filename);
- }) || false;
-};
-
-FileList.generatePreviewUrl = function(urlSpec) {
- urlSpec = urlSpec || {};
- if (!urlSpec.x) {
- urlSpec.x = 32;
- }
- if (!urlSpec.y) {
- urlSpec.y = 32;
- }
- urlSpec.x *= window.devicePixelRatio;
- urlSpec.y *= window.devicePixelRatio;
- urlSpec.x = Math.ceil(urlSpec.x);
- urlSpec.y = Math.ceil(urlSpec.y);
- urlSpec.forceIcon = 0;
- return OC.generateUrl('/core/preview.png?') + $.param(urlSpec);
-};
-
-FileList.isFileNameValid = function (name) {
- var trimmedName = name.trim();
- if (trimmedName === '.' || trimmedName === '..') {
- throw t('files', '"{name}" is an invalid file name.', {name: name});
- } else if (trimmedName.length === 0) {
- throw t('files', 'File name cannot be empty.');
- }
- return true;
-};
-
-FileList.setViewerMode = function(){
-};
-FileList.findFile = function(fileName){
- fullPath = escapeHTML(FileList.getCurrentDirectory + '/' + fileName);
- return !!$('.documentslist .document:not(.template,.progress) a[original-title="' + fullPath + '"]').length;
-};
-
$(document).ready(function() {
if (!OCA.Files) {
diff --git a/js/share.js b/js/share.js
deleted file mode 100644
index 04f9f2b2e..000000000
--- a/js/share.js
+++ /dev/null
@@ -1,1246 +0,0 @@
-/* global escapeHTML */
-
-(function(OC) {
- // copied and stripped out from the old core
- OC.Share = _.extend(OC.Share, {
- /**
- * @deprecated use OC.Share.currentShares instead
- */
- itemShares:[],
- /**
- * Full list of all share statuses
- */
- statuses:{},
- /**
- * Shares for the currently selected file.
- * (for which the dropdown is open)
- *
- * Key is item type and value is an array or
- * shares of the given item type.
- */
- currentShares: {},
- /**
- * Whether the share dropdown is opened.
- */
- droppedDown:false,
- /**
- * Loads ALL share statuses from server, stores them in
- * OC.Share.statuses then calls OC.Share.updateIcons() to update the
- * files "Share" icon to "Shared" according to their share status and
- * share type.
- *
- * If a callback is specified, the update step is skipped.
- *
- * @param itemType item type
- * @param fileList file list instance, defaults to OCA.Files.App.fileList
- * @param callback function to call after the shares were loaded
- */
- loadIcons:function(itemType, fileList, callback) {
- // Load all share icons
- $.get(
- OC.filePath('core', 'ajax', 'share.php'),
- {
- fetch: 'getItemsSharedStatuses',
- itemType: itemType
- }, function(result) {
- if (result && result.status === 'success') {
- OC.Share.statuses = {};
- $.each(result.data, function(item, data) {
- OC.Share.statuses[item] = data;
- });
- if (_.isFunction(callback)) {
- callback(OC.Share.statuses);
- } else {
- OC.Share.updateIcons(itemType, fileList);
- }
- }
- }
- );
- },
- /**
- * Updates the files' "Share" icons according to the known
- * sharing states stored in OC.Share.statuses.
- * (not reloaded from server)
- *
- * @param itemType item type
- * @param fileList file list instance
- * defaults to OCA.Files.App.fileList
- */
- updateIcons:function(itemType, fileList){
- var item;
- var $fileList;
- var currentDir;
- if (!fileList && OCA.Files) {
- fileList = OCA.Files.App.fileList;
- }
- // fileList is usually only defined in the files app
- if (fileList) {
- $fileList = fileList.$fileList;
- currentDir = fileList.getCurrentDirectory();
- }
- // TODO: iterating over the files might be more efficient
- for (item in OC.Share.statuses){
- var image = OC.imagePath('core', 'actions/share');
- var data = OC.Share.statuses[item];
- var hasLink = data.link;
- // Links override shared in terms of icon display
- if (hasLink) {
- image = OC.imagePath('core', 'actions/public');
- }
- if (itemType !== 'file' && itemType !== 'folder') {
- $('a.share[data-item="'+item+'"]').css('background', 'url('+image+') no-repeat center');
- } else {
- // TODO: ultimately this part should be moved to files_sharing app
- var file = $fileList.find('tr[data-id="'+item+'"]');
- var shareFolder = OC.imagePath('core', 'filetypes/folder-shared');
- var img;
- if (file.length > 0) {
- this.markFileAsShared(file, true, hasLink);
- } else {
- var dir = currentDir;
- if (dir.length > 1) {
- var last = '';
- var path = dir;
- // Search for possible parent folders that are shared
- while (path != last) {
- if (path === data.path && !data.link) {
- var actions = $fileList.find('.fileactions .action[data-action="Share"]');
- var files = $fileList.find('.filename');
- var i;
- for (i = 0; i < actions.length; i++) {
- // TODO: use this.markFileAsShared()
- img = $(actions[i]).find('img');
- if (img.attr('src') !== OC.imagePath('core', 'actions/public')) {
- img.attr('src', image);
- $(actions[i]).addClass('permanent');
- $(actions[i]).html(' '+t('core', 'Shared')+'').prepend(img);
- }
- }
- for(i = 0; i < files.length; i++) {
- if ($(files[i]).closest('tr').data('type') === 'dir') {
- $(files[i]).find('.thumbnail').css('background-image', 'url('+shareFolder+')');
- }
- }
- }
- last = path;
- path = OC.Share.dirname(path);
- }
- }
- }
- }
- }
- },
- updateIcon:function(itemType, itemSource) {
- var shares = false;
- var link = false;
- var image = OC.imagePath('core', 'actions/share');
- $.each(OC.Share.itemShares, function(index) {
- if (OC.Share.itemShares[index]) {
- if (index == OC.Share.SHARE_TYPE_LINK) {
- if (OC.Share.itemShares[index] == true) {
- shares = true;
- image = OC.imagePath('core', 'actions/public');
- link = true;
- return;
- }
- } else if (OC.Share.itemShares[index].length > 0) {
- shares = true;
- image = OC.imagePath('core', 'actions/share');
- }
- }
- });
- if (itemType != 'file' && itemType != 'folder') {
- $('a.share[data-item="'+itemSource+'"]').css('background', 'url('+image+') no-repeat center');
- } else {
- var $tr = $('tr').filterAttr('data-id', String(itemSource));
- if ($tr.length > 0) {
- // it might happen that multiple lists exist in the DOM
- // with the same id
- $tr.each(function() {
- OC.Share.markFileAsShared($(this), shares, link);
- });
- }
- }
- if (shares) {
- OC.Share.statuses[itemSource] = OC.Share.statuses[itemSource] || {};
- OC.Share.statuses[itemSource]['link'] = link;
- } else {
- delete OC.Share.statuses[itemSource];
- }
- },
- /**
- * Format a remote address
- *
- * @param {String} remoteAddress full remote share
- * @return {String} HTML code to display
- */
- _formatRemoteShare: function(remoteAddress) {
- var parts = this._REMOTE_OWNER_REGEXP.exec(remoteAddress);
- if (!parts) {
- // display as is, most likely to be a simple owner name
- return escapeHTML(remoteAddress);
- }
-
- var userName = parts[1];
- var userDomain = parts[3];
- var server = parts[4];
- var dir = parts[6];
- var tooltip = userName;
- if (userDomain) {
- tooltip += '@' + userDomain;
- }
- if (server) {
- if (!userDomain) {
- userDomain = '…';
- }
- tooltip += '@' + server;
- }
-
- var html = '';
- html += '' + escapeHTML(userName) + '';
- if (userDomain) {
- html += '@' + escapeHTML(userDomain) + '';
- }
- html += '';
- return html;
- },
- /**
- * Marks/unmarks a given file as shared by changing its action icon
- * and folder icon.
- *
- * @param $tr file element to mark as shared
- * @param hasShares whether shares are available
- * @param hasLink whether link share is available
- */
- loadItem:function(itemType, itemSource) {
- var data = '';
- var checkReshare = true;
- if (typeof OC.Share.statuses[itemSource] === 'undefined') {
- // NOTE: Check does not always work and misses some shares, fix later
- var checkShares = true;
- } else {
- var checkShares = true;
- }
- $.ajax({type: 'GET', url: OC.filePath('core', 'ajax', 'share.php'), data: { fetch: 'getItem', itemType: itemType, itemSource: itemSource, checkReshare: checkReshare, checkShares: checkShares }, async: false, success: function(result) {
- if (result && result.status === 'success') {
- data = result.data;
- } else {
- data = false;
- }
- }});
-
- return data;
- },
- share:function(itemType, itemSource, shareType, shareWith, permissions, itemSourceName, expirationDate, callback, errorCallback) {
- // Add a fallback for old share() calls without expirationDate.
- // We should remove this in a later version,
- // after the Apps have been updated.
- if (typeof callback === 'undefined' &&
- typeof expirationDate === 'function') {
- callback = expirationDate;
- expirationDate = '';
- console.warn(
- "Call to 'OC.Share.share()' with too few arguments. " +
- "'expirationDate' was assumed to be 'callback'. " +
- "Please revisit the call and fix the list of arguments."
- );
- }
-
- return $.post(OC.filePath('core', 'ajax', 'share.php'),
- {
- action: 'share',
- itemType: itemType,
- itemSource: itemSource,
- shareType: shareType,
- shareWith: shareWith,
- permissions: permissions,
- itemSourceName: itemSourceName,
- expirationDate: expirationDate
- }, function (result) {
- if (result && result.status === 'success') {
- if (callback) {
- callback(result.data);
- }
- } else {
- if (_.isUndefined(errorCallback)) {
- var msg = t('core', 'Error');
- if (result.data && result.data.message) {
- msg = result.data.message;
- }
- OC.dialogs.alert(msg, t('core', 'Error while sharing'));
- } else {
- errorCallback(result);
- }
- }
- }
- );
- },
- unshare:function(itemType, itemSource, shareType, shareWith, callback) {
- $.post(OC.filePath('core', 'ajax', 'share.php'), { action: 'unshare', itemType: itemType, itemSource: itemSource, shareType: shareType, shareWith: shareWith }, function(result) {
- if (result && result.status === 'success') {
- if (callback) {
- callback();
- }
- } else {
- OC.dialogs.alert(t('core', 'Error while unsharing'), t('core', 'Error'));
- }
- });
- },
- setPermissions:function(itemType, itemSource, shareType, shareWith, permissions) {
- $.post(OC.filePath('core', 'ajax', 'share.php'), { action: 'setPermissions', itemType: itemType, itemSource: itemSource, shareType: shareType, shareWith: shareWith, permissions: permissions }, function(result) {
- if (!result || result.status !== 'success') {
- OC.dialogs.alert(t('core', 'Error while changing permissions'), t('core', 'Error'));
- }
- });
- },
- showDropDown:function(itemType, itemSource, appendTo, link, possiblePermissions, filename) {
- var data = OC.Share.loadItem(itemType, itemSource);
- var dropDownEl;
- var html = ''+t('core', 'Shared in {item} with {user}', {'item': item, user: shareWithDisplayName})+' ';
- $('#shareWithList').prepend(html);
- }
- } else {
- var editChecked = createChecked = updateChecked = deleteChecked = shareChecked = '';
- if (permissions & OC.PERMISSION_CREATE) {
- createChecked = 'checked="checked"';
- editChecked = 'checked="checked"';
- }
- if (permissions & OC.PERMISSION_UPDATE) {
- updateChecked = 'checked="checked"';
- editChecked = 'checked="checked"';
- }
- if (permissions & OC.PERMISSION_DELETE) {
- deleteChecked = 'checked="checked"';
- editChecked = 'checked="checked"';
- }
- if (permissions & OC.PERMISSION_SHARE) {
- shareChecked = 'checked="checked"';
- }
- var html = '';
- var showCrudsButton;
- html += '+' "'+t('core', 'Unshare')+'")
';
- if (oc_config.enable_avatars === true) {
- html += '';
- }
- html += '' + escapeHTML(shareWithDisplayName) + '';
- var mailNotificationEnabled = $('input:hidden[name=mailNotificationEnabled]').val();
- if (mailNotificationEnabled === 'yes' && shareType !== OC.Share.SHARE_TYPE_REMOTE) {
- var checked = '';
- if (mailSend === '1') {
- checked = 'checked';
- }
- html += ' ';
- }
- if (oc_appconfig.core.resharingAllowed && (possiblePermissions & OC.PERMISSION_SHARE)) {
- html += '';
- html += '';
- }
- if (possiblePermissions & OC.PERMISSION_CREATE || possiblePermissions & OC.PERMISSION_UPDATE || possiblePermissions & OC.PERMISSION_DELETE) {
- html += '';
- html += '';
- }
- if (shareType !== OC.Share.SHARE_TYPE_REMOTE) {
- showCrudsButton = '+')
';
- }
- html += '';
- html += ' ';
- html = $(html).appendTo('#shareWithList');
- if (oc_config.enable_avatars === true) {
- if (shareType === OC.Share.SHARE_TYPE_USER) {
- html.find('.avatar').avatar(escapeHTML(shareWith), 32);
- } else {
- //Add sharetype to generate different seed if there is a group and use with the same name
- html.find('.avatar').imageplaceholder(escapeHTML(shareWith) + ' ' + shareType);
- }
- }
- // insert cruds button into last label element
- var lastLabel = html.find('>label:last');
- if (lastLabel.exists()){
- lastLabel.append(showCrudsButton);
- }
- else{
- html.find('.cruds').before(showCrudsButton);
- }
- if (!OC.Share.currentShares[shareType]) {
- OC.Share.currentShares[shareType] = [];
- }
- OC.Share.currentShares[shareType].push(shareItem);
- }
- },
- showLink:function(token, password, itemSource) {
- OC.Share.itemShares[OC.Share.SHARE_TYPE_LINK] = true;
- $('#linkCheckbox').attr('checked', true);
-
- //check itemType
- var linkSharetype=$('#dropdown').data('item-type');
-
- if (! token) {
- //fallback to pre token link
- var filename = $('tr').filterAttr('data-id', String(itemSource)).data('file');
- var type = $('tr').filterAttr('data-id', String(itemSource)).data('type');
- if ($('#dir').val() == '/') {
- var file = $('#dir').val() + filename;
- } else {
- var file = $('#dir').val() + '/' + filename;
- }
- file = '/'+OC.currentUser+'/files'+file;
- // TODO: use oc webroot ?
- var link = parent.location.protocol+'//'+location.host+OC.linkTo('', 'public.php')+'?service=files&'+type+'='+encodeURIComponent(file);
- } else {
- //TODO add path param when showing a link to file in a subfolder of a public link share
- var service='';
- if(linkSharetype === 'folder' || linkSharetype === 'file'){
- service='files';
- }else{
- service=linkSharetype;
- }
-
- // TODO: use oc webroot ?
- if (service !== 'files') {
- var link = parent.location.protocol+'//'+location.host+OC.linkTo('', 'public.php')+'?service='+service+'&t='+token;
- } else {
- var link = parent.location.protocol+'//'+location.host+OC.generateUrl('/s/')+token;
- }
- }
- $('#linkText').val(link);
- $('#linkText').slideDown(OC.menuSpeed);
- $('#linkText').css('display','block');
- if (oc_appconfig.core.enforcePasswordForPublicLink === false || password === null) {
- $('#showPassword').show();
- $('#showPassword+label').show();
- }
- if (password != null) {
- $('#linkPass').slideDown(OC.menuSpeed);
- $('#showPassword').attr('checked', true);
- $('#linkPassText').attr('placeholder', '**********');
- }
- $('#expiration').show();
- $('#emailPrivateLink #email').show();
- $('#emailPrivateLink #emailButton').show();
- $('#allowPublicUploadWrapper').show();
- },
- hideLink:function() {
- $('#linkText').slideUp(OC.menuSpeed);
- $('#defaultExpireMessage').hide();
- $('#showPassword').hide();
- $('#showPassword+label').hide();
- $('#linkPass').slideUp(OC.menuSpeed);
- $('#emailPrivateLink #email').hide();
- $('#emailPrivateLink #emailButton').hide();
- $('#allowPublicUploadWrapper').hide();
- },
- 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);
- },
- /**
- * Get the default Expire date
- *
- * @return {String} The expire date
- */
- getDefaultExpirationDate:function() {
- var expireDateString = '';
- if (oc_appconfig.core.defaultExpireDateEnabled) {
- var date = new Date().getTime();
- var expireAfterMs = oc_appconfig.core.defaultExpireDate * 24 * 60 * 60 * 1000;
- var expireDate = new Date(date + expireAfterMs);
- var month = expireDate.getMonth() + 1;
- var year = expireDate.getFullYear();
- var day = expireDate.getDate();
- expireDateString = year + "-" + month + '-' + day + ' 00:00:00';
- }
- return expireDateString;
- }
- });
-
- $(document).ready(function() {
-
- if(typeof monthNames != 'undefined'){
- // min date should always be the next day
- var minDate = new Date();
- minDate.setDate(minDate.getDate()+1);
- $.datepicker.setDefaults({
- monthNames: monthNames,
- monthNamesShort: $.map(monthNames, function(v) { return v.slice(0,3)+'.'; }),
- dayNames: dayNames,
- dayNamesMin: $.map(dayNames, function(v) { return v.slice(0,2); }),
- dayNamesShort: $.map(dayNames, function(v) { return v.slice(0,3)+'.'; }),
- firstDay: firstDay,
- minDate : minDate
- });
- }
- $(document).on('click', 'a.share', function(event) {
- event.stopPropagation();
- if ($(this).data('item-type') !== undefined && $(this).data('item') !== undefined) {
- var itemType = $(this).data('item-type');
- var itemSource = $(this).data('item');
- var appendTo = $(this).parent().parent();
- var link = false;
- var possiblePermissions = $(this).data('possible-permissions');
- if ($(this).data('link') !== undefined && $(this).data('link') == true) {
- link = true;
- }
- if (OC.Share.droppedDown) {
- if (itemSource != $('#dropdown').data('item')) {
- OC.Share.hideDropDown(function () {
- OC.Share.showDropDown(itemType, itemSource, appendTo, link, possiblePermissions);
- });
- } else {
- OC.Share.hideDropDown();
- }
- } else {
- OC.Share.showDropDown(itemType, itemSource, appendTo, link, possiblePermissions);
- }
- }
- });
-
- $(this).click(function(event) {
- var target = $(event.target);
- var isMatched = !target.is('.drop, .ui-datepicker-next, .ui-datepicker-prev, .ui-icon')
- && !target.closest('#ui-datepicker-div').length && !target.closest('.ui-autocomplete').length;
- if (OC.Share.droppedDown && isMatched && $('#dropdown').has(event.target).length === 0) {
- OC.Share.hideDropDown();
- }
- });
-
- $(document).on('click', '#dropdown .showCruds', function() {
- $(this).closest('li').find('.cruds').toggle();
- return false;
- });
-
- $(document).on('click', '#dropdown .unshare', function() {
- var $li = $(this).closest('li');
- var itemType = $('#dropdown').data('item-type');
- var itemSource = $('#dropdown').data('item-source');
- var shareType = $li.data('share-type');
- var shareWith = $li.attr('data-share-with');
- var $button = $(this);
-
- if (!$button.is('a')) {
- $button = $button.closest('a');
- }
-
- if ($button.hasClass('icon-loading-small')) {
- // deletion in progress
- return false;
- }
- $button.empty().addClass('icon-loading-small');
-
- OC.Share.unshare(itemType, itemSource, shareType, shareWith, function() {
- $li.remove();
- var index = OC.Share.itemShares[shareType].indexOf(shareWith);
- OC.Share.itemShares[shareType].splice(index, 1);
- // updated list of shares
- OC.Share.currentShares[shareType].splice(index, 1);
- $('#dropdown').trigger(new $.Event('sharesChanged', {shares: OC.Share.currentShares}));
- OC.Share.updateIcon(itemType, itemSource);
- if (typeof OC.Share.statuses[itemSource] === 'undefined') {
- $('#expiration').slideUp(OC.menuSpeed);
- }
- });
-
- return false;
- });
-
- $(document).on('change', '#dropdown .permissions', function() {
- var li = $(this).closest('li');
- if ($(this).attr('name') == 'edit') {
- var checkboxes = $('.permissions', li);
- var checked = $(this).is(':checked');
- // Check/uncheck Create, Update, and Delete checkboxes if Edit is checked/unck
- $(checkboxes).filter('input[name="create"]').attr('checked', checked);
- $(checkboxes).filter('input[name="update"]').attr('checked', checked);
- $(checkboxes).filter('input[name="delete"]').attr('checked', checked);
- } else {
- var checkboxes = $('.permissions', li);
- // Uncheck Edit if Create, Update, and Delete are not checked
- if (!$(this).is(':checked')
- && !$(checkboxes).filter('input[name="create"]').is(':checked')
- && !$(checkboxes).filter('input[name="update"]').is(':checked')
- && !$(checkboxes).filter('input[name="delete"]').is(':checked'))
- {
- $(checkboxes).filter('input[name="edit"]').attr('checked', false);
- // Check Edit if Create, Update, or Delete is checked
- } else if (($(this).attr('name') == 'create'
- || $(this).attr('name') == 'update'
- || $(this).attr('name') == 'delete'))
- {
- $(checkboxes).filter('input[name="edit"]').attr('checked', true);
- }
- }
- var permissions = OC.PERMISSION_READ;
- $(checkboxes).filter(':not(input[name="edit"])').filter(':checked').each(function(index, checkbox) {
- permissions |= $(checkbox).data('permissions');
- });
- OC.Share.setPermissions($('#dropdown').data('item-type'),
- $('#dropdown').data('item-source'),
- li.data('share-type'),
- li.attr('data-share-with'),
- permissions);
- });
-
- $(document).on('change', '#dropdown #linkCheckbox', function() {
- var $dropDown = $('#dropdown');
- var itemType = $dropDown.data('item-type');
- var itemSource = $dropDown.data('item-source');
- var itemSourceName = $dropDown.data('item-source-name');
- var $loading = $dropDown.find('#link .icon-loading-small');
- var $button = $(this);
-
- if (!$loading.hasClass('hidden')) {
- // already in progress
- return false;
- }
-
- if (this.checked) {
- // Reset password placeholder
- $('#linkPassText').attr('placeholder', t('core', 'Choose a password for the public link'));
- // Reset link
- $('#linkText').val('');
- $('#showPassword').prop('checked', false);
- $('#linkPass').hide();
- $('#sharingDialogAllowPublicUpload').prop('checked', false);
- $('#expirationCheckbox').prop('checked', false);
- $('#expirationDate').hide();
- var expireDateString = '';
- // Create a link
- if (oc_appconfig.core.enforcePasswordForPublicLink === false) {
- expireDateString = OC.Share.getDefaultExpirationDate();
- $loading.removeClass('hidden');
- $button.addClass('hidden');
- $button.prop('disabled', true);
-
- OC.Share.share(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, '', OC.PERMISSION_READ, itemSourceName, expireDateString, function(data) {
- $loading.addClass('hidden');
- $button.removeClass('hidden');
- $button.prop('disabled', false);
- OC.Share.showLink(data.token, null, itemSource);
- $('#dropdown').trigger(new $.Event('sharesChanged', {shares: OC.Share.currentShares}));
- OC.Share.updateIcon(itemType, itemSource);
- });
- } else {
- $('#linkPass').slideToggle(OC.menuSpeed);
- // TODO drop with IE8 drop
- if($('html').hasClass('ie8')) {
- $('#linkPassText').attr('placeholder', null);
- $('#linkPassText').val('');
- }
- $('#linkPassText').focus();
- }
- if (expireDateString !== '') {
- OC.Share.showExpirationDate(expireDateString);
- }
- } else {
- // Delete private link
- OC.Share.hideLink();
- $('#expiration').slideUp(OC.menuSpeed);
- if ($('#linkText').val() !== '') {
- $loading.removeClass('hidden');
- $button.addClass('hidden');
- $button.prop('disabled', true);
- OC.Share.unshare(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, '', function() {
- $loading.addClass('hidden');
- $button.removeClass('hidden');
- $button.prop('disabled', false);
- OC.Share.itemShares[OC.Share.SHARE_TYPE_LINK] = false;
- $('#dropdown').trigger(new $.Event('sharesChanged', {shares: OC.Share.currentShares}));
- OC.Share.updateIcon(itemType, itemSource);
- if (typeof OC.Share.statuses[itemSource] === 'undefined') {
- $('#expiration').slideUp(OC.menuSpeed);
- }
- });
- }
- }
- });
-
- $(document).on('click', '#dropdown #linkText', function() {
- $(this).focus();
- $(this).select();
- });
-
- // Handle the Allow Public Upload Checkbox
- $(document).on('click', '#sharingDialogAllowPublicUpload', function() {
-
- // Gather data
- var $dropDown = $('#dropdown');
- var allowPublicUpload = $(this).is(':checked');
- 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 permissions = 0;
- var $button = $(this);
- var $loading = $dropDown.find('#allowPublicUploadWrapper .icon-loading-small');
-
- if (!$loading.hasClass('hidden')) {
- // already in progress
- return false;
- }
-
- // Calculate permissions
- if (allowPublicUpload) {
- permissions = OC.PERMISSION_UPDATE + OC.PERMISSION_CREATE + OC.PERMISSION_READ;
- } else {
- permissions = OC.PERMISSION_READ;
- }
-
- // Update the share information
- $button.addClass('hidden');
- $button.prop('disabled', true);
- $loading.removeClass('hidden');
- OC.Share.share(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, '', permissions, itemSourceName, expirationDate, function(data) {
- $loading.addClass('hidden');
- $button.removeClass('hidden');
- $button.prop('disabled', false);
- });
- });
-
- $(document).on('click', '#dropdown #showPassword', function() {
- $('#linkPass').slideToggle(OC.menuSpeed);
- if (!$('#showPassword').is(':checked') ) {
- var itemType = $('#dropdown').data('item-type');
- var itemSource = $('#dropdown').data('item-source');
- var itemSourceName = $('#dropdown').data('item-source-name');
- var allowPublicUpload = $('#sharingDialogAllowPublicUpload').is(':checked');
- var permissions = 0;
- var $loading = $('#showPassword .icon-loading-small');
-
- // Calculate permissions
- if (allowPublicUpload) {
- permissions = OC.PERMISSION_UPDATE + OC.PERMISSION_CREATE + OC.PERMISSION_READ;
- } else {
- permissions = OC.PERMISSION_READ;
- }
-
- $loading.removeClass('hidden');
- OC.Share.share(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, '', permissions, itemSourceName).then(function() {
- $loading.addClass('hidden');
- $('#linkPassText').attr('placeholder', t('core', 'Choose a password for the public link'));
- });
- } else {
- $('#linkPassText').focus();
- }
- });
-
- $(document).on('focusout keyup', '#dropdown #linkPassText', function(event) {
- var linkPassText = $('#linkPassText');
- if ( linkPassText.val() != '' && (event.type == 'focusout' || event.keyCode == 13) ) {
- var allowPublicUpload = $('#sharingDialogAllowPublicUpload').is(':checked');
- var dropDown = $('#dropdown');
- var itemType = dropDown.data('item-type');
- var itemSource = dropDown.data('item-source');
- var itemSourceName = $('#dropdown').data('item-source-name');
- var permissions = 0;
- var $loading = dropDown.find('#linkPass .icon-loading-small');
-
- // Calculate permissions
- if (allowPublicUpload) {
- permissions = OC.PERMISSION_UPDATE + OC.PERMISSION_CREATE + OC.PERMISSION_READ;
- } else {
- permissions = OC.PERMISSION_READ;
- }
-
- var expireDateString = OC.Share.getDefaultExpirationDate();
-
- $loading.removeClass('hidden');
- OC.Share.share(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, $('#linkPassText').val(), permissions, itemSourceName, expireDateString, function(data) {
- $loading.addClass('hidden');
- linkPassText.val('');
- linkPassText.attr('placeholder', t('core', 'Password protected'));
-
- if (oc_appconfig.core.enforcePasswordForPublicLink) {
- OC.Share.showLink(data.token, "password set", itemSource);
- OC.Share.updateIcon(itemType, itemSource);
- }
- $('#dropdown').trigger(new $.Event('sharesChanged', {shares: OC.Share.currentShares}));
- }, function(result) {
- $loading.addClass('hidden');
- linkPassText.val('');
- linkPassText.attr('placeholder', result.data.message);
- });
-
- if (expireDateString !== '') {
- OC.Share.showExpirationDate(expireDateString);
- }
- }
- });
-
- $(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'));
- }
- });
-
- });
-
- });
-
-})(OC);
diff --git a/lib/Controller/DocumentController.php b/lib/Controller/DocumentController.php
new file mode 100644
index 000000000..b961b1264
--- /dev/null
+++ b/lib/Controller/DocumentController.php
@@ -0,0 +1,166 @@
+uid = $UserId;
+ $this->l10n = $l10n;
+ $this->settings = $settings;
+ $this->appConfig = $appConfig;
+ $this->cache = $cache->create($appName);
+ $this->discoveryManager = $discoveryManager;
+ }
+
+ /**
+ * @NoAdminRequired
+ * @NoCSRFRequired
+ *
+ * @return TemplateResponse
+ */
+ public function index(){
+ $response = new TemplateResponse('richdocuments', 'documents');
+ $policy = new ContentSecurityPolicy();
+ $policy->addAllowedFrameDomain($this->appConfig->getAppValue('wopi_url'));
+ $response->setContentSecurityPolicy($policy);
+ return $response;
+ }
+
+ /**
+ * @NoAdminRequired
+ */
+ public function create(){
+ $mimetype = $this->request->post['mimetype'];
+ $filename = $this->request->post['filename'];
+ $dir = $this->request->post['dir'];
+
+ $view = new View('/' . $this->uid . '/files');
+ if (!$dir){
+ $dir = '/';
+ }
+
+ $basename = $this->l10n->t('New Document.odt');
+ switch ($mimetype) {
+ case 'application/vnd.oasis.opendocument.spreadsheet':
+ $basename = $this->l10n->t('New Spreadsheet.ods');
+ break;
+ case 'application/vnd.oasis.opendocument.presentation':
+ $basename = $this->l10n->t('New Presentation.odp');
+ break;
+ case 'application/vnd.openxmlformats-officedocument.wordprocessingml.document':
+ $basename = $this->l10n->t('New Document.docx');
+ break;
+ case 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet':
+ $basename = $this->l10n->t('New Spreadsheet.xlsx');
+ break;
+ case 'application/vnd.openxmlformats-officedocument.presentationml.presentation':
+ $basename = $this->l10n->t('New Presentation.pptx');
+ break;
+ default:
+ // to be safe
+ $mimetype = 'application/vnd.oasis.opendocument.text';
+ break;
+ }
+
+ if (!$filename){
+ $path = Helper::getNewFileName($view, $dir . '/' . $basename);
+ } else {
+ $path = $dir . '/' . $filename;
+ }
+
+ $content = '';
+ if (class_exists('\OC\Files\Type\TemplateManager')){
+ $manager = \OC_Helper::getFileTemplateManager();
+ $content = $manager->getTemplate($mimetype);
+ }
+
+ if (!$content){
+ $content = file_get_contents(dirname(__DIR__) . self::ODT_TEMPLATE_PATH);
+ }
+
+ $discovery_parsed = null;
+ try {
+ $discovery = $this->discoveryManager->get();
+
+ $loadEntities = libxml_disable_entity_loader(true);
+ $discovery_parsed = simplexml_load_string($discovery);
+ libxml_disable_entity_loader($loadEntities);
+
+ if ($discovery_parsed === false) {
+ $this->cache->remove('discovery.xml');
+ $wopiRemote = $this->getWopiUrl(false);
+
+ return array(
+ 'status' => 'error',
+ 'message' => $this->l10n->t('Collabora Online: discovery.xml from "%s" is not a well-formed XML string.', array($wopiRemote)),
+ 'hint' => $this->l10n->t('Please contact the "%s" administrator.', array($wopiRemote))
+ );
+ }
+ }
+ catch (ResponseException $e) {
+ return array(
+ 'status' => 'error',
+ 'message' => $e->getMessage(),
+ 'hint' => $e->getHint()
+ );
+ }
+
+ if ($content && $view->file_put_contents($path, $content)){
+ $info = $view->getFileInfo($path);
+ $ret = $this->getWopiSrcUrl($discovery_parsed, $mimetype);
+ $response = array(
+ 'status' => 'success',
+ 'fileid' => $info['fileid'],
+ 'urlsrc' => $ret['urlsrc'],
+ 'action' => $ret['action'],
+ 'lolang' => $this->settings->getUserValue($this->uid, 'core', 'lang', 'en'),
+ 'data' => \OCA\Files\Helper::formatFileInfo($info)
+ );
+ } else {
+ $response = array(
+ 'status' => 'error',
+ 'message' => (string) $this->l10n->t('Can\'t create document')
+ );
+ }
+ return $response;
+ }
+}
diff --git a/controller/settingscontroller.php b/lib/Controller/SettingsController.php
similarity index 63%
rename from controller/settingscontroller.php
rename to lib/Controller/SettingsController.php
index 22440bf3e..69b280849 100644
--- a/controller/settingscontroller.php
+++ b/lib/Controller/SettingsController.php
@@ -12,23 +12,32 @@
namespace OCA\Richdocuments\Controller;
use \OCP\AppFramework\Controller;
+use OCP\AppFramework\Http\JSONResponse;
use \OCP\IRequest;
use \OCP\IL10N;
-use \OCP\AppFramework\Http\JSONResponse;
-use OCP\AppFramework\Http\TemplateResponse;
use OCA\Richdocuments\AppConfig;
use OCA\Richdocuments\Filter;
class SettingsController extends Controller{
-
- private $userId;
+ /** @var IL10N */
private $l10n;
+ /** @var AppConfig */
private $appConfig;
- public function __construct($appName, IRequest $request, IL10N $l10n, AppConfig $appConfig, $userId){
+ /**
+ * @param string $appName
+ * @param IRequest $request
+ * @param IL10N $l10n
+ * @param AppConfig $appConfig
+ * @param string $userId
+ */
+ public function __construct($appName,
+ IRequest $request,
+ IL10N $l10n,
+ AppConfig $appConfig,
+ $userId) {
parent::__construct($appName, $request);
- $this->userId = $userId;
$this->l10n = $l10n;
$this->appConfig = $appConfig;
}
@@ -45,20 +54,26 @@ class SettingsController extends Controller{
/**
* @NoAdminRequired
+ *
+ * @return JSONResponse
*/
public function getSettings() {
- return array(
+ return new JSONResponse([
'doc_format' => $this->appConfig->getAppValue('doc_format'),
'wopi_url' => $this->appConfig->getAppValue('wopi_url'),
- 'test_wopi_url' => $this->appConfig->getAppValue('test_wopi_url'),
- 'test_server_groups' => $this->appConfig->getAppValue('test_server_groups')
- );
+ ]);
}
- public function setSettings($wopi_url, $edit_groups, $doc_format, $test_wopi_url, $test_server_groups){
+ /**
+ * @param string $wopi_url
+ * @param string $doc_format
+ * @return JSONResponse
+ */
+ public function setSettings($wopi_url,
+ $doc_format){
$message = $this->l10n->t('Saved');
- if (!is_null($wopi_url)){
+ if ($wopi_url !== null){
$this->appConfig->setAppValue('wopi_url', $wopi_url);
$colon = strpos($wopi_url, ':', 0);
@@ -67,22 +82,10 @@ class SettingsController extends Controller{
}
}
- if (!is_null($edit_groups)){
- $this->appConfig->setAppValue('edit_groups', $edit_groups);
- }
-
- if (!is_null($doc_format)){
+ if ($doc_format !== null) {
$this->appConfig->setAppValue('doc_format', $doc_format);
}
- if (!is_null($test_wopi_url)){
- $this->appConfig->setAppValue('test_wopi_url', $test_wopi_url);
- }
-
- if (!is_null($test_server_groups)){
- $this->appConfig->setAppValue('test_server_groups', $test_server_groups);
- }
-
$richMemCache = \OC::$server->getMemCacheFactory()->create('richdocuments');
$richMemCache->clear('discovery.xml');
@@ -91,6 +94,6 @@ class SettingsController extends Controller{
'data' => array('message' => (string) $message)
);
- return $response;
+ return new JSONResponse($response);
}
}
diff --git a/lib/Controller/WopiController.php b/lib/Controller/WopiController.php
new file mode 100644
index 000000000..676fb0e92
--- /dev/null
+++ b/lib/Controller/WopiController.php
@@ -0,0 +1,245 @@
+
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see /resources/config/ca-bundle.crt" . The exact error message was: ') . $error_message);
+ }
+ }
+ throw new ResponseException($this->l10n->t('Collabora Online unknown error: ') . $error_message, $contact_admin);
+ }
+
+ $responseBody = $response->getBody();
+ $file->putContent(
+ json_encode([
+ 'data' => $responseBody,
+ 'timestamp' => $this->timeFactory->getTime(),
+ ])
+ );
+ return $responseBody;
+ }
+}
diff --git a/lib/WOPI/Parser.php b/lib/WOPI/Parser.php
new file mode 100644
index 000000000..934ead697
--- /dev/null
+++ b/lib/WOPI/Parser.php
@@ -0,0 +1,58 @@
+
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see
- -
-
/>
\ No newline at end of file
diff --git a/templates/documents.php b/templates/documents.php
index 33978dc70..ccf29b84a 100644
--- a/templates/documents.php
+++ b/templates/documents.php
@@ -1,10 +1,6 @@
';
- if (data !== false && data.reshare !== false && data.reshare.uid_owner !== undefined && data.reshare.uid_owner !== OC.currentUser) {
- html += '';
- if (oc_config.enable_avatars === true) {
- html += ' ';
- }
-
- 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 += '
'; - // 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 += ''; - html += ''; - if(oc_appconfig.core.remoteShareAllowed) { - var federatedCloudSharingDoc = ''; - html += federatedCloudSharingDoc.replace('{docLink}', oc_appconfig.core.federatedCloudShareDoc); - } - html += ''; - html += ''; - var linksAllowed = $('#allowShareWithLink').val() === 'yes'; - if (link && linksAllowed) { - html += '" )
- .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 $(' ')
- .append('' + escapeHTML(item.displayname) + "
" + escapeHTML(item.email) + '' ) - .appendTo( ul ); - }; - } - - } else { - html += ''; - html += '
';
- 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;
- $('#dropdown').slideUp(OC.menuSpeed, function() {
- OC.Share.droppedDown = false;
- $('#dropdown').remove();
- if (typeof FileActions !== 'undefined') {
- $('tr').removeClass('mouseOver');
- }
- if (callback) {
- callback.call();
- }
- });
- },
- addShareWith:function(shareType, shareWith, shareWithDisplayName, permissions, possiblePermissions, mailSend, collection) {
- var shareItem = {
- share_type: shareType,
- share_with: shareWith,
- share_with_displayname: shareWithDisplayName,
- permissions: permissions
- };
- if (shareType === OC.Share.SHARE_TYPE_GROUP) {
- shareWithDisplayName = shareWithDisplayName + " (" + t('core', 'group') + ')';
- }
- if (shareType === OC.Share.SHARE_TYPE_REMOTE) {
- shareWithDisplayName = shareWithDisplayName + " (" + t('core', 'remote') + ')';
- }
- if (!OC.Share.itemShares[shareType]) {
- OC.Share.itemShares[shareType] = [];
- }
- OC.Share.itemShares[shareType].push(shareWith);
- if (collection) {
- if (collection.item_type == 'file' || collection.item_type == 'folder') {
- var item = collection.path;
- } else {
- var item = collection.item_source;
- }
- var collectionList = $('#shareWithList li').filterAttr('data-collection', item);
- if (collectionList.length > 0) {
- $(collectionList).append(', '+shareWithDisplayName);
- } else {
- var html = ''; - // 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 += ''; - html += ''; - if(oc_appconfig.core.remoteShareAllowed) { - var federatedCloudSharingDoc = ''; - html += federatedCloudSharingDoc.replace('{docLink}', oc_appconfig.core.federatedCloudShareDoc); - } - html += ''; - html += ''; - var linksAllowed = $('#allowShareWithLink').val() === 'yes'; - if (link && linksAllowed) { - html += '
';
- html += '';
- html += '';
- html += '
'; - - 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}) + '
'; - } - - html += ''; - html += ''; - html += ''; - html += '
';
- var mailPublicNotificationEnabled = $('input:hidden[name=mailPublicNotificationEnabled]').val();
- if (mailPublicNotificationEnabled === 'yes') {
- html += '';
- }
- }
-
- html += ''; - - 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}) + '
'; - } - - html += ''; - html += ''; - html += ''; - html += '
';
- html += '';
- html += '';
- html += '';
- html += '
';
-
- if (itemType === 'folder' && (possiblePermissions & OC.PERMISSION_CREATE) && publicUploadEnabled === 'yes') {
- html += '';
- }
- html += '';
- html += '';
- html += '';
- html += '';
- html += ''+defaultExpireMessage+'';
- html += '
';
- 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 = $( "" );
- 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('');
- }
- return $( "" + escapeHTML(item.email) + '' ) - .appendTo( ul ); - }; - } - - } else { - html += ''; - html += '
- -
-
-
-
-
-
-
- t('URL (and port) of the Collabora Online test server.')) ?>
-
-
-
-
/>