Update hub bundle and add proxy rule to htaccess

Signed-off-by: Julius Härtl <jus@bitgrid.net>

diff --git a/core/src/components/setup/RecommendedApps.vue b/core/src/components/setup/RecommendedApps.vue
index 550c3aaff7093566b4fb61f68167f805e9ed1e8c..46fac684370ae471f1c779f9a254b20ebfb2988e 100644 (file)
--- 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 18dd90936230be90677f758ddac4c33b6eacc111..59b52389ef8111e862ceaf2fbf0036772d1fdcfd 100644 (file)
--- 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 3fc8415e29afc86132b683c3bb21dfae0062a12f..856ed1d78858b265fb392aa41a17d1fcd6895c5d 100644 (file)
--- 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>";