' +
'
',
+ viewContainer: '' +
+ '' +
+ '
',
+
+ revHistoryContainerTemplate: '' +
+ '
',
+
+ revHistoryItemTemplate: '' +
+ '
' +
+ 'Revision History
' + + '{{filename}}' + + '' +
+ '
' +
+ '' +
+ ''));
+ }
+
+ $.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);
+
+ // 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 = $('li[data-id='+ fileId.replace(/_.*/, '') +']>a').attr('urlsrc') +
+ "WOPISrc=" + wopisrc +
+ "&title=" + encodeURIComponent(title) +
+ "&closebutton=1" +
+ "&permission=readonly";
+
+ // 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 Viewer
+ var frame = '';
+
+ $('#revViewer').append(form);
+ $('#revViewer').append(frame);
+ // handler for the 'Close' button - we have enabled it via closebutton=1
+ $('#loleafletframe_viewer').load(function(){
+ window.addEventListener('message', function(e){
+ if (e.data === 'close') {
+ documentsMain.onCloseViewer();
+ }
+ });
+ });
+
+ // submit that
+ $('#loleafletform_viewer').submit();
+ documentsMain.isViewerMode = true;
+ });
+ },
+
+ addRevision: function(fileId, version, relativeTimestamp, documentPath) {
+ var formattedTimestamp = OC.Util.formatDate(parseInt(version) * 1000);
+ var fileName = documentsMain.fileName.substring(0, documentsMain.fileName.indexOf('.'));
+ var downloadUrl;
+ if (version === 0) {
+ formattedTimestamp = t('richdocuments', 'Latest revision');
+ downloadUrl = OC.generateUrl('apps/files/download'+ documentPath);
+ fileId = fileId.replace(/_.*/, '');
+ } else {
+ downloadUrl = OC.generateUrl('apps/files_versions/download.php?file={file}&revision={revision}',
+ {file: documentPath, revision: version});
+ fileId = fileId + '_' + version;
+ }
+
+ var revHistoryItemTemplate = Handlebars.compile(documentsMain.UI.revHistoryItemTemplate);
+ var html = revHistoryItemTemplate({
+ downloadUrl: downloadUrl,
+ downloadIconUrl: OC.imagePath('core', 'actions/download'),
+ relativeTimestamp: relativeTimestamp,
+ formattedTimestamp: formattedTimestamp
+ });
+
+ html = $(html).attr('data-fileid', fileId)
+ .attr('data-title', fileName + ' - ' + formattedTimestamp);
+ $('#revisionsContainer ul').append(html);
+ },
+
+ fetchAndFillRevisions: function(documentPath) {
+ // fill #rev-history with file versions
+ $.get(OC.generateUrl('apps/files_versions/ajax/getVersions.php?source={documentPath}&start={start}',
+ { documentPath: documentPath, start: documentsMain.UI.revisionsStart }),
+ function(result) {
+ for(var key in result.data.versions) {
+ documentsMain.UI.addRevision(documentsMain.fileId,
+ result.data.versions[key].version,
+ result.data.versions[key].humanReadableTimestamp,
+ documentPath);
+ }
+
+ // owncloud only gives 5 version at max in one go
+ documentsMain.UI.revisionsStart += 5;
+
+ if (result.data.endReached) {
+ // Remove 'More versions' button
+ $('#show-more-versions').addClass('hidden');
+ }
+ });
+ },
+
+ showRevHistory: function(documentPath) {
+ $(document.body).prepend(documentsMain.UI.viewContainer);
+
+ var revHistoryContainerTemplate = Handlebars.compile(documentsMain.UI.revHistoryContainerTemplate);
+ var revHistoryContainer = revHistoryContainerTemplate({
+ filename: documentsMain.fileName,
+ moreVersionsLabel: t('richdocuments', 'More versions...')
+ });
+ $(document.body).prepend(revHistoryContainer);
+
+ documentsMain.UI.revisionsStart = 0;
+
+ // append current document first
+ documentsMain.UI.addRevision(documentsMain.fileId, 0, t('richdocuments', 'Just now'), documentPath);
+
+ // add "Show more versions" button
+ $('#show-more-versions').click(function(e) {
+ e.preventDefault();
+ documentsMain.UI.fetchAndFillRevisions(documentPath);
+ });
+
+ // fake click to load first 5 versions
+ $('#show-more-versions').click();
+
+ // make these revisions clickable/attach functionality
+ $('#revisionsContainer').on('click', '.versionPreview', function(e) {
+ e.preventDefault();
+ documentsMain.UI.showViewer(e.currentTarget.parentElement.dataset.fileid,
+ e.currentTarget.parentElement.dataset.title);
+
+ // mark only current as active
+ $(e.currentTarget.parentElement.parentElement).find('li').removeClass('active');
+ $(e.currentTarget.parentElement).addClass('active');
+ });
+
+ // fake click on first revision (i.e current revision)
+ $('#revisionsContainer li').first().find('.versionPreview').click();
+ },
+
showEditor : function(title){
if (documentsMain.isGuest){
// !Login page mess wih WebODF toolbars
@@ -239,7 +401,7 @@ var documentsMain = {
// 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
+ // https://:9980/hosting/discovery
var urlsrc = $('li[data-id='+ documentsMain.fileId +']>a').attr('urlsrc') +
"WOPISrc=" + wopisrc +
"&title=" + encodeURIComponent(title) +
@@ -263,8 +425,13 @@ var documentsMain = {
$('#loleafletframe').load(function(){
documentsMain.overlay.documentOverlay('hide');
window.addEventListener('message', function(e){
+ if (documentsMain.isViewerMode) {
+ return;
+ }
if (e.data === 'close') {
documentsMain.onClose();
+ } else if (e.data === 'rev-history') {
+ documentsMain.UI.showRevHistory($('li[data-id=' + documentsMain.fileId + ']>a').attr('original-title'));
}
});
});
@@ -612,7 +779,7 @@ var documentsMain = {
},
- onClose: function() {
+ onClose: function(force) {
if (!documentsMain.isEditorMode){
return;
}
@@ -625,13 +792,21 @@ var documentsMain = {
documentsMain.UI.hideEditor();
$('#ocToolbar').remove();
- if (documentsMain.returnToDir) {
+ if (!force && documentsMain.returnToDir) {
window.location = OC.generateUrl('apps/files?dir={dir}', {dir: documentsMain.returnToDir});
} else {
documentsMain.show();
}
},
+ onCloseViewer: function() {
+ $('#revPanelContainer').remove();
+ $('#revViewerContainer').remove();
+ documentsMain.isViewerMode = false;
+
+ $('#loleafletframe').focus();
+ },
+
onTerminate: function(){
var url = '';
if (documentsMain.isGuest){
diff --git a/lib/db/wopi.php b/lib/db/wopi.php
index 01fade90..423e5038 100644
--- a/lib/db/wopi.php
+++ b/lib/db/wopi.php
@@ -29,20 +29,23 @@ class Wopi extends \OCA\Richdocuments\Db{
protected $tableName = '`*PREFIX*richdocuments_wopi`';
- protected $insertStatement = 'INSERT INTO `*PREFIX*richdocuments_wopi` (`owner_uid`, `editor_uid`, `fileid`, `path`, `token`, `expiry`)
- VALUES (?, ?, ?, ?, ?, ?)';
+ protected $insertStatement = 'INSERT INTO `*PREFIX*richdocuments_wopi` (`owner_uid`, `editor_uid`, `fileid`, `version`, `path`, `token`, `expiry`)
+ VALUES (?, ?, ?, ?, ?, ?, ?)';
protected $loadStatement = 'SELECT * FROM `*PREFIX*richdocuments_wopi` WHERE `token`= ?';
/*
- * Given a fileId, generates a token
+ * Given a fileId and version, generates a token
* and stores in the database.
+ * version is 0 if current version of fileId is requested, otherwise
+ * its the version number as stored by files_version app
* Returns the token.
*/
- public function generateFileToken($fileId){
+ public function generateFileToken($fileId, $version){
// Get the FS view of the current user.
$view = \OC\Files\Filesystem::getView();
+
// Get the virtual path (if the file is shared).
$path = $view->getPath($fileId);
@@ -67,13 +70,14 @@ class Wopi extends \OCA\Richdocuments\Db{
\OCP\Security\ISecureRandom::CHAR_LOWER . \OCP\Security\ISecureRandom::CHAR_UPPER .
\OCP\Security\ISecureRandom::CHAR_DIGITS);
- \OC::$server->getLogger()->debug('Issuing token for {editor} file {fileId} owned by {owner}, path {path}: {token}',
- [ 'owner' => $owner, 'editor' => $editor, 'fileId' => $fileId, 'path' => $path, 'token' => $token ]);
+ \OC::$server->getLogger()->debug('Issuing token for {editor} file {fileId}, version {version} owned by {owner}, path {path}: {token}',
+ [ 'owner' => $owner, 'editor' => $editor, 'fileId' => $fileId, 'version' => $version, 'path' => $path, 'token' => $token ]);
$wopi = new \OCA\Richdocuments\Db\Wopi([
$owner,
$editor,
$fileId,
+ $version,
$path,
$token,
time() + self::TOKEN_LIFETIME_SECONDS
@@ -91,7 +95,7 @@ class Wopi extends \OCA\Richdocuments\Db{
* constructs and validates the path.
* Returns the path, if valid, else false.
*/
- public function getPathForToken($fileId, $token){
+ public function getPathForToken($fileId, $version, $token){
$wopi = new Wopi();
$row = $wopi->loadBy('token', $token)->getData();
@@ -110,7 +114,7 @@ class Wopi extends \OCA\Richdocuments\Db{
//$wopi->deleteBy('id', $row['id']);
//return false;
}
- if ($row['fileid'] !== $fileId){
+ if ($row['fileid'] !== $fileId || $row['version'] !== $version){
// File unknown / user unauthorized (for the requested file).
http_response_code(404);
return false;