Merge pull request #2301 from proxyconcept/fix-mimetypes-for-onlyoffice

nextcloud · Sep 8, 2023 · 04b6e0a · 04b6e0a
2 parents 193640d + ed7bb01
commit 04b6e0a
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 6 deletions.
diff --git a/lib/Capabilities.php b/lib/Capabilities.php
@@ -44,10 +44,13 @@ class Capabilities implements ICapability {
  'application/vnd.visio',
  'application/vnd.ms-visio.drawing',
  'application/vnd.wordperfect',
- 'application/msonenote',
- 'application/msword',
  'application/rtf',
  'text/rtf',
+ ];
+
+ public const MIMETYPES_MSOFFICE = [
+ 'application/msonenote',
+ 'application/msword',
  'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
  'application/vnd.openxmlformats-officedocument.wordprocessingml.template',
  'application/vnd.ms-word.document.macroEnabled.12',
@@ -116,25 +119,33 @@ public function getCapabilities() {
 
  if (!$this->capabilities) {
  $collaboraCapabilities = $this->capabilitiesService->getCapabilities();
- $filteredMimetypes = self::MIMETYPES;
+
+ $defaultMimetypes = self::MIMETYPES;
  $optionalMimetypes = self::MIMETYPES_OPTIONAL;
+
+ if (!$this->capabilitiesService->hasOtherOOXMLApps()) {
+ array_push($defaultMimetypes, ...self::MIMETYPES_MSOFFICE);
+ } else {
+ array_push($optionalMimetypes, ...self::MIMETYPES_MSOFFICE);
+ }
+
  // If version is too old, draw is not supported
  if (!$this->capabilitiesService->hasDrawSupport()) {
- $filteredMimetypes = array_diff($filteredMimetypes, [
+ $defaultMimetypes = array_diff($defaultMimetypes, [
  'application/vnd.oasis.opendocument.graphics',
  'application/vnd.oasis.opendocument.graphics-flat-xml',
  ]);
  }
 
  if (!$this->appManager->isEnabledForUser('files_pdfviewer')) {
- $filteredMimetypes[] = 'application/pdf';
+ $defaultMimetypes[] = 'application/pdf';
  $optionalMimetypes = array_diff($optionalMimetypes, ['application/pdf']);
  }
 
  $this->capabilities = [
  'richdocuments' => [
  'version' => $this->appManager->getAppVersion('richdocuments'),
- 'mimetypes' => array_values($filteredMimetypes),
+ 'mimetypes' => array_values($defaultMimetypes),
  'mimetypesNoDefaultOpen' => array_values($optionalMimetypes),
  'mimetypesSecureView' => $this->config->useSecureViewAdditionalMimes() ? self::SECURE_VIEW_ADDITIONAL_MIMES : [],
  'collabora' => $collaboraCapabilities,

diff --git a/lib/Service/CapabilitiesService.php b/lib/Service/CapabilitiesService.php
@@ -112,6 +112,18 @@ public function getProductName(): string {
  return $this->l10n->t('Nextcloud Office');
  }
 
+ public function hasOtherOOXMLApps(): bool {
+ if ($this->appManager->isEnabledForUser('officeonline')) {
+ return true;
+ }
+
+ if ($this->appManager->isEnabledForUser('onlyoffice')) {
+ return true;
+ }
+
+ return false;
+ }
+
  public function clear(): void {
  $this->cache->remove('capabilities');
  }