DontSellMe/richdocuments
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #11 from hcvcastro/master

Browse Source 
Add WOPI client settings
This commit is contained in:
Andras Timar 2016-03-06 09:05:44 +01:00
commit 0f01c190ef
7 changed files with 83 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
controller/documentcontroller.php
View File

@ -58,12 +58,12 @@ class DocumentController extends Controller{
'uploadMaxFilesize' => $maxUploadFilesize,
'uploadMaxHumanFilesize' => \OCP\Util::humanFileSize($maxUploadFilesize),
'allowShareWithLink' => $this->settings->getAppValue('core', 'shareapi_allow_links', 'yes'),
'wopi_url' => $this->settings->getAppValue('richdocuments', 'wopi_url'),
]);
$policy = new ContentSecurityPolicy();
//$policy->addAllowedChildSrcDomain('\'self\' http://ajax.googleapis.com/ajax/libs/jquery/2.1.0/jquery.min.js http://cdnjs.cloudflare.com/ajax/libs/jquery-mousewheel/3.1.12/jquery.mousewheel.min.js \'unsafe-eval\'');
$policy->addAllowedScriptDomain('\'self\' http://ajax.googleapis.com/ajax/libs/jquery/2.1.0/jquery.min.js http://cdnjs.cloudflare.com/ajax/libs/jquery-mousewheel/3.1.12/jquery.mousewheel.min.js \'unsafe-eval\'');
$policy->addAllowedFrameDomain('\'self\' http://ajax.googleapis.com/ajax/libs/jquery/2.1.0/jquery.min.js http://cdnjs.cloudflare.com/ajax/libs/jquery-mousewheel/3.1.12/jquery.mousewheel.min.js \'unsafe-eval\'');
+ $policy->addAllowedScriptDomain('\'self\' http://ajax.googleapis.com/ajax/libs/jquery/2.1.0/jquery.min.js http://cdnjs.cloudflare.com/ajax/libs/jquery-mousewheel/3.1.12/jquery.mousewheel.min.js \'unsafe-eval\' ' . $this->settings->getAppValue('richdocuments', 'wopi_url'));
+ $policy->addAllowedFrameDomain('\'self\' http://ajax.googleapis.com/ajax/libs/jquery/2.1.0/jquery.min.js http://cdnjs.cloudflare.com/ajax/libs/jquery-mousewheel/3.1.12/jquery.mousewheel.min.js \'unsafe-eval\' ' . $this->settings->getAppValue('richdocuments', 'wopi_url'));
$policy->addAllowedConnectDomain('ws://' . $_SERVER['SERVER_NAME'] . ':9980');
$policy->addAllowedImageDomain('*');
$policy->allowInlineScript(true);

45
controller/settingscontroller.php
View File

@ -22,18 +22,18 @@ use OCA\Richdocuments\Converter;
use OCA\Richdocuments\Filter;
class SettingsController extends Controller{
private $userId;
private $l10n;
private $appConfig;
public function __construct($appName, IRequest $request, IL10N $l10n, AppConfig $appConfig, $userId){
parent::__construct($appName, $request);
$this->userId = $userId;
$this->l10n = $l10n;
$this->appConfig = $appConfig;
}
/**
* @NoAdminRequired
*/
@ -43,47 +43,48 @@ class SettingsController extends Controller{
'mimes' => Filter::getAll()
);
}
/**
* @NoAdminRequired
* @NoCSRFRequired
*/
public function personalIndex(){
return new TemplateResponse(
$this->appName,
$this->appName,
'personal',
[ 'save_path' => $this->appConfig->getUserValue($this->userId, 'save_path') ],
'blank'
);
}
/**
* @NoCSRFRequired
*/
public function settingsIndex(){
return new TemplateResponse(
$this->appName,
$this->appName,
'settings',
[ 'unstable' => $this->appConfig->getAppValue('unstable') ],
'blank'
);
}
/**
* @NoCSRFRequired
*/
public function adminIndex(){
return new TemplateResponse(
$this->appName,
$this->appName,
'admin',
[
'converter' => $this->appConfig->getAppValue('converter'),
'wopi_url' => $this->appConfig->getAppValue('wopi_url'),
'converter_url' => $this->appConfig->getAppValue('converter_url'),
],
'blank'
);
}
/**
* @NoAdminRequired
*/
@ -95,7 +96,7 @@ class SettingsController extends Controller{
if (\OC\Files\Filesystem::file_exists($savePath) === false ){
$status = \OC\Files\Filesystem::mkdir($savePath);
}
if ($status){
$this->appConfig->setUserValue($this->userId, 'save_path', $savePath);
$response = array(
@ -112,33 +113,37 @@ class SettingsController extends Controller{
}
return $response;
}
public function setUnstable($unstable){
if (!is_null($unstable)){
$this->appConfig->setAppValue('unstable', $unstable);
}
return array('status' => 'success');
}
public function setConverter($converter, $url){
public function setConverter($converter, $wopi_url, $url){
if (!is_null($converter)){
$this->appConfig->setAppValue('converter', $converter);
}
if (!is_null($wopi_url)){
$this->appConfig->setAppValue('wopi_url', $wopi_url);
}
if (!is_null($url)){
$this->appConfig->setAppValue('converter_url', $url);
}
$response = array(
'status' => 'success',
'data' => array('message' => (string) $this->l10n->t('Saved'))
);
$currentConverter = $this->appConfig->getAppValue('converter');
if ($currentConverter == 'external'){
if (!Converter::checkConnection()){
\OC::$server->getLogger()->warning(
'Bad response from Format Filter Server',
'Bad response from Format Filter Server',
['app' => $this->appName]
);
$response = array(
@ -150,7 +155,7 @@ class SettingsController extends Controller{
} elseif ($currentConverter === 'local') {
try {
if (!Converter::testConversion()){
$response = array(
$response = array(
'status' => 'error',
'data'=>
array('message' => (string) $this->l10n->t('Conversion failed. Check log for details.') )
@ -163,7 +168,7 @@ class SettingsController extends Controller{
);
}
}
return $response;
}
}

17
js/admin.js
View File

@ -1,32 +1,33 @@
/*global OC, $ */
$(document).ready(function(){
var documentsSettings = {
save : function() {
$('#docs_apply').attr('disabled', true);
var data = {
converter : $('[name="docs_converter"]:checked').val()
};
converter : $('[name="docs_converter"]:checked').val(),
wopi_url : $('#wopi_url').val()
};
if (data.converter === 'external'){
data.url = $('#docs_url').val();
}
OC.msg.startAction('#documents-admin-msg', t('richdocuments', 'Saving...'));
$.post(
OC.filePath('richdocuments', 'ajax', 'admin.php'),
OC.filePath('richdocuments', 'ajax', 'admin.php'),
data,
documentsSettings.afterSave
);
},
afterSave : function(response){
$('#docs_apply').attr('disabled', false);
OC.msg.finishedAction('#documents-admin-msg', response);
}
};
$('#docs_converter_external, #docs_converter_local, #docs_converter_off').on('click', function(){
$('#docs_extra').toggle($('[name="docs_converter"]:checked').val() === 'external');
});

52
js/documents.js
View File

@ -179,22 +179,28 @@ var documentsMain = {
$(document.body).prepend(documentsMain.UI.container);
$('title').text(title + ' - ' + documentsMain.UI.mainTitle);
var viewer = window.location.protocol + '//' + window.location.host + '/loleaflet/dist/loleaflet.html?' +
'file_path=' + documentsMain.url +
'&host=' + 'ws://' + window.location.hostname + ':9980' +
'&permission=' + 'view' +
'&timestamp=' + '';
var frame = '<iframe id="loleafletframe" allowfullscreen style="width:100%;height:100%;position:absolute;" src="' + viewer + '" sandbox="allow-scripts allow-same-origin allow-popups allow-modals"/>';
// TODO. wopiurl = get from discovery xml
var wopiurl = $('#wopi-url').val() + '/loleaflet/dist/loleaflet.html';
var wopisrc = documentsMain.url;
var action = wopiurl + '?' + wopisrc;
var token = oc_requesttoken;
var form = '<form id="loleafletform" name="loleafletform" target="loleafletframe" action="' + action + '" method="post">' +
'<input name="access_token" value="' + token + '" type="hidden"/></form>';
var frame = '<iframe id="loleafletframe" name= "loleafletframe" allowfullscreen style="width:100%;height:100%;position:absolute;"/>';
$('#mainContainer').append(form);
$('#mainContainer').append(frame);
documentsMain.overlay.documentOverlay('hide');
$('#loleafletframe').load(function(){
var iframe = $('#loleafletframe').contents();
// avoid Blocked a frame with origin different domains
/*var iframe = $('#loleafletframe').contents();
iframe.find('#tb_toolbar-up_item_close').click(function() {
documentsMain.onClose();
});
var frameWindow = $('#loleafletframe')[0].contentWindow;
});*/
/*var frameWindow = $('#loleafletframe')[0].contentWindow;
(function() {
cloudSuiteOnClick = frameWindow.onClick;
frameWindow.onClick = function() {
@ -203,8 +209,9 @@ var documentsMain = {
cloudSuiteOnClick.apply(this, arguments);
frameWindow.map.options.doc = documentsMain.url;
};
})();
})();*/
});
$('#loleafletform').submit();
},
hideEditor : function(){
@ -499,25 +506,12 @@ var documentsMain = {
},
loadDocument: function() {
var url = OC.generateUrl('apps/richdocuments/load/{file_id}', {file_id: documentsMain.fileId});
$.post(
url,
{},
function(result) {
if (result && result.status === 'error') {
if (result.message){
documentsMain.IU.notify(result.message);
}
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;
}
documentsMain.url = 'file://' + result.filename;
documentsMain.baseName = result.basename;
documentsMain.UI.showEditor(documentsMain.fileName);
}
);
// Provides access to information about a file and allows
// for file-level operations.
// HTTP://server/<...>/wopi*/files/<id>
var url = window.location.protocol + '//' + window.location.host + OC.generateUrl('apps/documents/wopi/files/{file_id}', {file_id: documentsMain.fileId}, false);
documentsMain.url = 'WOPISrc=' + encodeURIComponent(url);
documentsMain.UI.showEditor(documentsMain.fileName);
},
saveDocumentBack: function() {

17
lib/appconfig.php
View File

@ -8,7 +8,7 @@
* This file is licensed under the Affero General Public License version 3 or
* later.
*/
namespace OCA\Richdocuments;
use \OCP\IConfig;
@ -18,15 +18,16 @@ use \OCP\IConfig;
private $defaults = [
'converter' => 'off',
'converter_url' => 'http://localhost:16080',
'unstable' => 'false'
'unstable' => 'false',
'wopi_url' => 'htpp://localhost'
];
private $config;
public function __construct(IConfig $config) {
$this->config = $config;
}
/**
* Can we convert anything to odt?
* @return bool
@ -34,7 +35,7 @@ use \OCP\IConfig;
public function isConverterEnabled(){
return $this->getAppValue('converter') !== 'off';
}
/**
* Get a value by key
* @param string $key
@ -57,7 +58,7 @@ use \OCP\IConfig;
public function setAppValue($key, $value) {
return $this->config->setAppValue($this->appName, $key, $value);
}
/**
* Get a value by key for a user
* @param string $userId
@ -83,4 +84,4 @@ use \OCP\IConfig;
return $this->config->setAppValue($userId, $this->appName, $key, $value);
}
}

19
templates/admin.php
View File

@ -5,34 +5,39 @@ script('richdocuments', 'admin');
<h2><?php p($l->t('Documents')) ?></h2>
<p><?php p($l->t('MS Word support (requires openOffice/libreOffice)')) ?></p>
<p>
<input type="radio" name="docs_converter" value="local" id="docs_converter_local"
<?php print_unescaped($_['converter']=='local' ? 'checked="checked"' : '') ?>
<input type="radio" name="docs_converter" value="local" id="docs_converter_local"
<?php print_unescaped($_['converter']=='local' ? 'checked="checked"' : '') ?>
/>
<label for="docs_converter_local"><?php p($l->t('Local')) ?></label><br>
<em><?php p($l->t('openOffice/libreOffice is installed on this server. Path to binary is provided via preview_libreoffice_path in config.php')) ?></em>
</p>
<p>
<input type="radio" name="docs_converter" value="external" id="docs_converter_external"
<?php print_unescaped($_['converter']=='external' ? 'checked="checked"' : '') ?>
<?php print_unescaped($_['converter']=='external' ? 'checked="checked"' : '') ?>
/>
<label for="docs_converter_external"><?php p($l->t('External')) ?></label><br>
<em><?php p($l->t('openOffice/libreOffice is installed on external server running a format filter server')) ?></em>
</p>
<p>
<input type="radio" name="docs_converter" value="off" id="docs_converter_off"
<?php print_unescaped($_['converter']=='off' ? 'checked="checked"' : '') ?>
<?php print_unescaped($_['converter']=='off' ? 'checked="checked"' : '') ?>
/>
<label for="docs_converter_off"><?php p($l->t('Disabled')) ?></label><br>
<em><?php p($l->t('No MS Word support')) ?></em>
</p>
<div id="docs_extra" <?php print_unescaped($_['converter']!=='external' ? 'style="display:none"' : '') ?>>
<input type="text" name="docs_url" id="docs_url"
value="<?php p($_['converter_url'])?>"
original-title="<?php p($l->t('scheme://domain.tld[:port]')) ?>"
<input type="text" name="docs_url" id="docs_url"
value="<?php p($_['converter_url'])?>"
original-title="<?php p($l->t('scheme://domain.tld[:port]')) ?>"
style="width:250px;"
/>
<br /><em><?php p($l->t('Server URL')) ?></em>
</div>
<br />
<div id="wopi_client">
<input type="text" name="wopi_url" id="wopi_url" value="<?php p($_['wopi_url'])?>" style="width:250px;">
<br /><em><?php p($l->t('WOPI Client')) ?></em>
</div>
<br /><button type="button" id="docs_apply"><?php p($l->t('Apply and test')) ?></button>
<span id="documents-admin-msg" class="msg"></span>
</div>

3
templates/documents.php
View File

@ -13,7 +13,7 @@ script('files', 'jquery.fileupload');
<li class="add-document">
<a class="icon-add add-odt svg" target="_blank" href="">
<label><?php p($l->t('New Document')) ?></label>
</a>
</a>
<a class="icon-add add-ods svg" target="_blank" href="">
<label><?php p($l->t('New Spreadsheet')) ?></label>
</a>
@ -50,6 +50,7 @@ script('files', 'jquery.fileupload');
</li>
</ul>
</div>
<input type="hidden" id="wopi-url" name="wopi-url" value="<?php p($_['wopi_url']) ?>" />
<input type="hidden" id="webodf-unstable" value="<?php p($_['useUnstable']) ?>" />
<?php if ($_['enable_previews']): ?>
<input type="hidden" id="previews_enabled" value="<?php p($_['enable_previews']) ?>" />