holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Fix opening collabora fails from a shared directory:

Browse Source 
-we need to have collabora app to avoid CSP error since redirect share-link in collabora should get frame-src. e.g:(Collabora/Src/Ui.php:redirect(Sharing::share2link))
This commit is contained in:
Hadi Nategh 2018-03-16 13:15:45 +01:00
parent e9b80ecee5
commit be4dbc37ae
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
api/src/Vfs/Sharing.php
View File

@ -305,6 +305,17 @@ class Sharing
// --> we dont need session and close it, to not modifiy it // --> we dont need session and close it, to not modifiy it
elseif ($keep_session === false) elseif ($keep_session === false)
{ {
if ($GLOBALS['egw']->sharing->use_collabora())
{
// check if sharee has Collabora run rights --> give is to share too
// we need to have collabora app to avoid CSP error since redirect share-link
// in collabora should get frame-src. e.g:(Collabora/Src/Ui.php:redirect(Sharing::share2link))
$apps = $GLOBALS['egw']->acl->get_user_applications($share['share_owner']);
if (!empty($apps['collabora']))
{
$GLOBALS['egw_info']['user']['apps']['collabora'] = $GLOBALS['egw_info']['apps']['collabora'];
}
}
$GLOBALS['egw']->session->commit_session(); $GLOBALS['egw']->session->commit_session();
} }
// need to store new fstab and vfs_user in session to allow GET requests / downloads via WebDAV // need to store new fstab and vfs_user in session to allow GET requests / downloads via WebDAV