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

cleanup

Browse Source
This commit is contained in:
Andrei Sacuiu 2017-03-24 16:39:01 +01:00
parent 0a8c089ee0
commit 9c4da055a8
2 changed files with 43 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
js/viewer/viewer.js
View File

@ -124,15 +124,24 @@ var odfViewer = {
$('#app-content #controls').addClass('hidden'); $('#app-content #controls').addClass('hidden');
$('#app-content').append($iframe); $('#app-content').append($iframe);
$.ajax({type: 'GET', url: OC.filePath('richdocuments', 'ajax', 'generate.php'), data: {id: context.$file.attr('data-id')}, async: false, success: function(result) { $.ajax({type: 'GET',
if(result.status=="success"){ url: OC.filePath('richdocuments', 'ajax', 'generate.php'),
var $chatroom = $('<iframe id="chatroom" data-chatroom-password="'+result.password+'" data-chatroom-title="'+fileName+'" data-chatroom-name="'+result.name+'" hidden />'); data: {id: context.$file.attr('data-id')},
$('#app-content').append($chatroom); async: false, success: function(result) {
if(result.status=="success"){
var $chatroom = $('<div />');
$chatroom.attr('id','chatroom');
$chatroom.data('chatroom-password',result.password);
$chatroom.data('chatroom-name',result.name);
$chatroom.data('chatroom-title',fileName);
$('#app-content').append($chatroom);
} else {
console.log(result.message);
}
}, error: function(xhr, textStatus, errorThrown){
console.log(errorThrown);
} }
});
}, error: function(xhr, textStatus, errorThrown){
password=errorThrown;
}});
}, },

54
lib/Controller/DocumentController.php
View File

@ -256,35 +256,33 @@ class DocumentController extends Controller {
* @NoAdminRequired * @NoAdminRequired
*/ */
public function generate($id) { public function generate($id) {
if((!empty($id))) {
$view = \OC\Files\Filesystem::getView();
try {
$path = $view->getPath($id);
if ($view->is_file($path) && $view->isReadable($path)) {
$secret = \OC::$server->getConfig()->getSystemValue("secret");
$instanceID = \OC::$server->getConfig()->getSystemValue("instanceid");
$chatRoomPassword = hash('sha512', "chatroom-password".$instanceID.$secret.$id);
$chatRoomName = hash('sha512', "chatroom-name".$instanceID.$secret.$id);
return array(
'status' => 'success','password' => $chatRoomPassword,'name' => $chatRoomName
);
} else {
return array(
'status' => 'unauthorised'
);
}
} catch (\Exception $e) {
return array(
'status' => 'unauthorised'
);
}
if (empty($id)) {
return array(
'status' => 'error',
'message' => 'no id received');
}
$view = \OC\Files\Filesystem::getView();
try {
$path = $view->getPath($id);
if ($view->is_file($path) && $view->isReadable($path)) {
$secret = \OC::$server->getConfig()->getSystemValue('secret');
$instanceID = \OC::$server->getConfig()->getSystemValue('instanceid');
$chatRoomPassword = hash('sha512', 'chatroom-password'.$instanceID.$secret.$id);
$chatRoomName = hash('sha512','chatroom-name'.$instanceID.$secret.$id);
return array(
'status' => 'success',
'password' => $chatRoomPassword,
'name' => $chatRoomName);
} else {
return array(
'status' => 'error',
'message' => 'user unauthorised to view file');
}
} catch (\Exception $e) {
return array(
'status' => 'error',
'message' => 'user unauthorised to view file');
} }
return array(
'status' => 'no id received'
);
} }
} }