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

fix filemanager default to use Collabora for office files

Browse Source
This commit is contained in:
Ralf Becker 2019-07-09 16:11:35 +02:00
parent 70e2c0bcd8
commit abe17476dd
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
filemanager/inc/class.filemanager_hooks.inc.php
View File

@ -293,7 +293,7 @@ class filemanager_hooks
'help' => lang('Defines how to open a merge print document'), 'help' => lang('Defines how to open a merge print document'),
'name' => 'merge_open_handler', 'name' => 'merge_open_handler',
'values' => $merge_open_handler, 'values' => $merge_open_handler,
'default' => $GLOBALS['egw_info']['user']['apps']['collabora'] ? 'collabora' : 'download', 'default' => file_exists(EGW_SERVER_ROOT.'/collabora') ? 'collabora' : 'download',
), ),
'document_doubleclick_action' => array ( 'document_doubleclick_action' => array (
'type' => 'select', 'type' => 'select',
@ -301,7 +301,7 @@ class filemanager_hooks
'help' => lang('Defines how to handle double click action on a document file. Images are always opened in the expose-view and emails with email application. All other mime-types are handled by the browser itself.'), 'help' => lang('Defines how to handle double click action on a document file. Images are always opened in the expose-view and emails with email application. All other mime-types are handled by the browser itself.'),
'name' => 'document_doubleclick_action', 'name' => 'document_doubleclick_action',
'values' => $document_doubleclick_action, 'values' => $document_doubleclick_action,
'default' => $GLOBALS['egw_info']['user']['apps']['collabora'] ? 'collabora' : 'download', 'default' => file_exists(EGW_SERVER_ROOT.'/collabora') ? 'collabora' : 'download',
) )
); );
@ -344,18 +344,17 @@ class filemanager_hooks
/** /**
* Gets registered links for VFS file editor * Gets registered links for VFS file editor
* *
* @return array links * @return array|null links
*/ */
static function getEditorLink() static function getEditorLink()
{ {
$implemented = Api\Hooks::implemented('filemanager-editor-link'); foreach (Api\Hooks::process('filemanager-editor-link', 'collabora') as $app => $link)
foreach ($implemented as $app)
{ {
if (($access = \EGroupware\Api\Vfs\Links\StreamWrapper::check_app_rights($app)) && if ($link && ($access = \EGroupware\Api\Vfs\Links\StreamWrapper::check_app_rights($app)) &&
($l = Api\Hooks::process('filemanager-editor-link',$app, true)) && $l[$app] (empty($GLOBALS['egw_info']['user']['preferences']['filemanager']['document_doubleclick_action']) ||
&& $GLOBALS['egw_info']['user']['preferences']['filemanager']['document_doubleclick_action'] == $app) $GLOBALS['egw_info']['user']['preferences']['filemanager']['document_doubleclick_action'] == $app))
{ {
$link = $l[$app]; break;
} }
} }
return $link; return $link;