use SSL
This commit is contained in:
Родитель
deed4fc366
Коммит
f3eaa1683d
|
@ -92,12 +92,12 @@ class DocumentController extends Controller{
|
|||
"/hosting/discovery" );
|
||||
$webSocket = sprintf(
|
||||
"%s%s%s",
|
||||
"ws://",
|
||||
"wss://",
|
||||
isset($parts['host']) ? $parts['host'] : "",
|
||||
isset($parts['port']) ? ":" . $parts['port'] : "");
|
||||
}
|
||||
else {
|
||||
return $this->responseError('Invalid Collabora Libre Office Online', $wopiRemote);
|
||||
return $this->responseError('Invalid Collabora Online', $wopiRemote);
|
||||
}
|
||||
|
||||
$memcache = \OC::$server->getMemCacheFactory();
|
||||
|
|
|
@ -85,26 +85,6 @@ var odfViewer = {
|
|||
var attachTo = odfViewer.isDocuments ? '#documents-content' : '#controls';
|
||||
|
||||
FileList.setViewerMode(true);
|
||||
|
||||
// TODO call something like in the onEdit case; or do we want
|
||||
// view-only at all?
|
||||
/*
|
||||
var viewer = window.location.protocol + '//' + window.location.host + '/loleaflet/dist/loleaflet.html?' +
|
||||
'file_path=' + context.dir + '/' + filename +
|
||||
'&host=' + 'ws://' + window.location.hostname + ':9980' +
|
||||
'&permission=' + 'view' +
|
||||
'×tamp=' + '';
|
||||
|
||||
var frame = '<iframe id="loleafletframe" style="width:100%;height:100%;display:block;position:fixed;top:46px;" src="' + viewer + '" sandbox="allow-scripts allow-same-origin allow-popups"/>';
|
||||
$(attachTo).append(frame);
|
||||
|
||||
$('#loleafletframe').load(function(){
|
||||
var iframe = $('#loleafletframe').contents();
|
||||
iframe.find('#tb_toolbar-up_item_close').click(function() {
|
||||
odfViewer.onClose();
|
||||
});
|
||||
});
|
||||
*/
|
||||
},
|
||||
|
||||
onClose: function() {
|
||||
|
|
|
@ -16,7 +16,7 @@ use \OCP\IConfig;
|
|||
class AppConfig{
|
||||
private $appName = 'richdocuments';
|
||||
private $defaults = [
|
||||
'wopi_url' => 'http://localhost:9980'
|
||||
'wopi_url' => 'https://localhost:9980'
|
||||
];
|
||||
|
||||
private $config;
|
||||
|
|
Загрузка…
Ссылка в новой задаче