diff --git a/CHANGELOG.md b/CHANGELOG.md index b5f8415f0d..01463807c9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +**1.1.25** +- Bug: Fix height for revision history viewer +- Feature: Support for multitenancy installations of LibreOffice Online + **1.1.24** - Bug: Fix undefined PHP notices - Security: Properly check for password on password protected shares \ No newline at end of file diff --git a/appinfo/info.xml b/appinfo/info.xml index 94ca260ecf..f3519366f6 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -5,7 +5,7 @@ Collabora Online allows you to to work with all kinds of office documents directly in your browser. This application requires Collabora Cloudsuite to be installed on one of your servers, please read the documentation to learn more about that. Edit office documents directly in your browser. AGPL - 1.1.24 + 1.1.25 Collabora Productivity based on work of Frank Karlitschek, Victor Dubiniuk https://github.com/nextcloud/richdocuments/issues https://github.com/nextcloud/richdocuments.git diff --git a/css/style.css b/css/style.css index 78160fa98f..3368cc7a72 100644 --- a/css/style.css +++ b/css/style.css @@ -133,7 +133,7 @@ width: 100%; z-index: 600; background-color: #ddd !important; - top: 45px; + top: 0px; bottom: 0; } @@ -149,7 +149,7 @@ z-index: 600; background-color: #efefef !important; right: 0; - top: 45px; + top: 0px; bottom: 0; box-sizing: border-box; overflow-x: hidden; diff --git a/js/documents.js b/js/documents.js index 7beebee432..3c44b34b87 100644 --- a/js/documents.js +++ b/js/documents.js @@ -119,7 +119,7 @@ var documentsMain = { } // 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 wopiurl = window.location.protocol + '//' + window.location.host + OC.generateUrl('apps/richdocuments/wopi/files/{file_id}_{instanceId}', {file_id: fileId, instanceId: instanceId}); var wopisrc = encodeURIComponent(wopiurl); // urlsrc - the URL from discovery xml that we access for the particular diff --git a/lib/Controller/DocumentController.php b/lib/Controller/DocumentController.php index 4fde3599f0..731f10bc1e 100644 --- a/lib/Controller/DocumentController.php +++ b/lib/Controller/DocumentController.php @@ -104,10 +104,11 @@ public function index($fileId) { $params = [ 'permissions' => $item->getPermissions(), 'title' => $item->getName(), - 'fileId' => $item->getId(), + 'fileId' => $item->getId() . '_' . $this->settings->getSystemValue('instanceid'), 'token' => $token, 'urlsrc' => $urlSrc, 'path' => '/', + 'instanceId' => $this->settings->getSystemValue('instanceid'), ]; $response = new TemplateResponse('richdocuments', 'documents', $params, 'empty'); @@ -153,10 +154,11 @@ public function publicPage($shareToken, $fileName) { $params = [ 'permissions' => $share->getPermissions(), 'title' => $item->getName(), - 'fileId' => $item->getId(), + 'fileId' => $item->getId() . '_' . $this->settings->getSystemValue('instanceid'), 'token' => $token, 'urlsrc' => $urlSrc, 'path' => '/', + 'instanceId' => $this->settings->getSystemValue('instanceid'), ]; $response = new TemplateResponse('richdocuments', 'documents', $params, 'empty'); @@ -233,7 +235,7 @@ public function create($mimetype, $ret = $this->wopiParser->getUrlSrc($mimetype); $response = array( 'status' => 'success', - 'fileid' => $info['fileid'], + 'fileid' => $info['fileid'] . '_' . $this->settings->getSystemValue('instanceid'), 'urlsrc' => $ret['urlsrc'], 'action' => $ret['action'], 'lolang' => $this->settings->getUserValue($this->uid, 'core', 'lang', 'en'), diff --git a/lib/Controller/WopiController.php b/lib/Controller/WopiController.php index 0ced466972..561305e025 100644 --- a/lib/Controller/WopiController.php +++ b/lib/Controller/WopiController.php @@ -35,32 +35,42 @@ class WopiController extends Controller { /** @var IRootFolder */ private $rootFolder; - /** @var string */ - private $userId; - /** @var IUserManager */ - private $userManager; - /** @var Parser */ - private $wopiParser; /** * @param string $appName * @param IRequest $request * @param IRootFolder $rootFolder * @param string $UserId - * @param IUserManager $userManager - * @param Parser $wopiParser */ public function __construct($appName, $UserId, IRequest $request, - IRootFolder $rootFolder, - IUserManager $userManager, - Parser $wopiParser) { + IRootFolder $rootFolder) { parent::__construct($appName, $request); $this->rootFolder = $rootFolder; - $this->userId = $UserId; - $this->userManager = $userManager; - $this->wopiParser = $wopiParser; + } + + /** + * @param string $fileId + * @return array + * @throws \Exception + */ + private function parseFileId($fileId) { + $arr = explode('_', $fileId, 2); + if (count($arr) === 2) { + list($fileId, $instanceId) = $arr; + $version = '0'; + } else if (count($arr) === 3) { + list($fileId, $instanceId, $version) = $arr; + } else { + throw new \Exception('$fileId has not the expected format'); + } + + return [ + $fileId, + $instanceId, + $version, + ]; } /** @@ -76,11 +86,7 @@ public function __construct($appName, public function checkFileInfo($fileId) { $token = $this->request->getParam('access_token'); - $arr = explode('_', $fileId, 2); - $version = '0'; - if (count($arr) === 2) { - list($fileId, $version) = $arr; - } + list($fileId, , $version) = $this->parseFileId($fileId); $row = new Wopi(); $row->loadBy('token', $token); @@ -130,11 +136,7 @@ public function checkFileInfo($fileId) { */ public function getFile($fileId, $access_token) { - $arr = explode('_', $fileId, 2); - $version = '0'; - if (count($arr) === 2) { - list($fileId, $version) = $arr; - } + list($fileId, , $version) = $this->parseFileId($fileId); $row = new Wopi(); $row->loadBy('token', $access_token); @@ -165,12 +167,9 @@ public function getFile($fileId, * @param string $access_token * @return JSONResponse */ - public function putFile($fileId, $access_token) { - $arr = explode('_', $fileId, 2); - $version = '0'; - if (count($arr) === 2) { - list($fileId, $version) = $arr; - } + public function putFile($fileId, + $access_token) { + list($fileId, , $version) = $this->parseFileId($fileId); $row = new Wopi(); $row->loadBy('token', $access_token); diff --git a/templates/documents.php b/templates/documents.php index 41e114e0d3..6d5dc79ad6 100644 --- a/templates/documents.php +++ b/templates/documents.php @@ -5,6 +5,7 @@ var richdocuments_token = ''; var richdocuments_urlsrc = ''; var richdocuments_path = ''; + var instanceId = '';