From bde5b9577b97234cf80adb3e7bc987913b3189ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julius=20H=C3=A4rtl?= <jus@bitgrid.net>
Date: Mon, 25 May 2020 16:04:54 +0200
Subject: [PATCH] Update hub bundle and add proxy rule to htaccess
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Julius Härtl <jus@bitgrid.net>
---
 core/src/components/setup/RecommendedApps.vue  | 6 +++---
 lib/private/App/AppStore/Bundles/HubBundle.php | 4 ++--
 lib/private/Setup.php                          | 1 +
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/core/src/components/setup/RecommendedApps.vue b/core/src/components/setup/RecommendedApps.vue
index 550c3aaff7..46fac68437 100644
--- a/core/src/components/setup/RecommendedApps.vue
+++ b/core/src/components/setup/RecommendedApps.vue
@@ -82,11 +82,11 @@ const recommended = {
 	spreed: {
 		description: t('core', 'Chatting, video calls, screensharing, online meetings and web conferencing – in your browser and with mobile apps.'),
 	},
-	onlyoffice: {
+	richdocuments: {
 		description: t('core', 'Collaboratively edit office documents.'),
 	},
-	documentserver_community: {
-		description: t('core', 'Local document editing back-end used by the OnlyOffice app.'),
+	richdocumentscode: {
+		description: t('core', 'Local document editing back-end used by the Collabora Online app.'),
 	},
 }
 const recommendedIds = Object.keys(recommended)
diff --git a/lib/private/App/AppStore/Bundles/HubBundle.php b/lib/private/App/AppStore/Bundles/HubBundle.php
index 18dd909362..59b52389ef 100644
--- a/lib/private/App/AppStore/Bundles/HubBundle.php
+++ b/lib/private/App/AppStore/Bundles/HubBundle.php
@@ -37,8 +37,8 @@ class HubBundle extends Bundle {
 			'contacts',
 			'calendar',
 			'mail',
-			'documentserver_community',
-			'onlyoffice',
+			'richdocumentscode',
+			'richdocuments',
 		];
 	}
 }
diff --git a/lib/private/Setup.php b/lib/private/Setup.php
index 3fc8415e29..856ed1d788 100644
--- a/lib/private/Setup.php
+++ b/lib/private/Setup.php
@@ -543,6 +543,7 @@ class Setup {
 			$content .= "\n  RewriteCond %{REQUEST_FILENAME} !/ocs-provider/";
 			$content .= "\n  RewriteCond %{REQUEST_FILENAME} !/ocm-provider/";
 			$content .= "\n  RewriteCond %{REQUEST_URI} !^/\\.well-known/(acme-challenge|pki-validation)/.*";
+			$content .= "\n  RewriteCond %{REQUEST_FILENAME} !/richdocumentscode/proxy.php$";
 			$content .= "\n  RewriteRule . index.php [PT,E=PATH_INFO:$1]";
 			$content .= "\n  RewriteBase " . $rewriteBase;
 			$content .= "\n  <IfModule mod_env.c>";