Merge remote-tracking branch 'origin/master' into enh/frontend-api-deliveryv3.7.3-frontendapi-8

14 files changed, 15 insertions, 6 deletions

diff --git a/.travis.yml b/.travis.yml
index 024c2acd..a2067e06 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,7 +2,6 @@ sudo: required
 dist: trusty
 language: php
 php:
-  - 7.2
   - 7.3
 env:
   global:
@@ -32,9 +31,9 @@ matrix:
     env: "DB=sqlite CORE_BRANCH=stable15"
   - php: 7.0
     env: "DB=sqlite CORE_BRANCH=stable15 TEST=lint"
-  - php: 7.2
+  - php: 7.3
     env: "DB=sqlite"
-  - php: 7.2
+  - php: 7.3
     env: "DB=pgsql"
   allow_failures:
   - env: "DB=mysql TEST=checker"
diff --git a/appinfo/info.xml b/appinfo/info.xml
index 894ef4c8..1af1ae90 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -29,7 +29,7 @@ You can also edit your documents off-line with the Collabora Office app from the
 	<screenshot>https://www.collaboraoffice.com/nextcloud/co/collabora-online-screenshot-4.png</screenshot>
 	<screenshot>https://www.collaboraoffice.com/nextcloud/co/collabora-online-screenshot-5.png</screenshot>
 	<dependencies>
-		<nextcloud min-version="15" max-version="20" />
+		<nextcloud min-version="15" max-version="21" />
 	</dependencies>
 	<background-jobs>
 		<job>OCA\Richdocuments\Backgroundjobs\ObtainCapabilities</job>
diff --git a/l10n/ca.js b/l10n/ca.js
index 76738831..19e70623 100644
--- a/l10n/ca.js
+++ b/l10n/ca.js
@@ -94,6 +94,7 @@ OC.L10N.register(
     "Error: Cannot find the AppImage, please reinstall the Collabora Online Built-in server." : "Error: no es troba l'AppImage, torneu a instal·lar el servidor integrat Collabora Online.",
     "Error: Unable to make the AppImage executable, please setup a standalone server." : "Error: no es pot fer executable l'AppImage, configureu un servidor independent.",
     "Error: Exec disabled in PHP, please enable it, or setup a standalone server." : "Error: Exec desactivat en PHP, si us plau, habiliteu-lo o configureu un servidor independent.",
+    "Error: Not running on x86-64 or ARM64 (aarch64) Linux, please setup a standalone server." : "Error: No s'està executant en x86-64 o ARM64 (aarch64) Linux, configureu un servidor independent.",
     "Error: The fontconfig library is not installed on your server, please install it or setup a standalone server." : "Error: la biblioteca fontconfig no està instal·lada al servidor, instal·leu-la o configureu un servidor independent.",
     "Error: Not running on glibc-based Linux, please setup a standalone server." : "Error: no s'està executant en Linux basat en glibc, configureu un servidor independent.",
     "Error: Cannot start the Collabora Online Built-in server, please setup a standalone one." : "Error: No es pot iniciar el servidor integrat de Collabora Online, configureu-ne un de independent.",
diff --git a/l10n/ca.json b/l10n/ca.json
index 0f0a2c96..b2bd40d6 100644
--- a/l10n/ca.json
+++ b/l10n/ca.json
@@ -92,6 +92,7 @@
     "Error: Cannot find the AppImage, please reinstall the Collabora Online Built-in server." : "Error: no es troba l'AppImage, torneu a instal·lar el servidor integrat Collabora Online.",
     "Error: Unable to make the AppImage executable, please setup a standalone server." : "Error: no es pot fer executable l'AppImage, configureu un servidor independent.",
     "Error: Exec disabled in PHP, please enable it, or setup a standalone server." : "Error: Exec desactivat en PHP, si us plau, habiliteu-lo o configureu un servidor independent.",
+    "Error: Not running on x86-64 or ARM64 (aarch64) Linux, please setup a standalone server." : "Error: No s'està executant en x86-64 o ARM64 (aarch64) Linux, configureu un servidor independent.",
     "Error: The fontconfig library is not installed on your server, please install it or setup a standalone server." : "Error: la biblioteca fontconfig no està instal·lada al servidor, instal·leu-la o configureu un servidor independent.",
     "Error: Not running on glibc-based Linux, please setup a standalone server." : "Error: no s'està executant en Linux basat en glibc, configureu un servidor independent.",
     "Error: Cannot start the Collabora Online Built-in server, please setup a standalone one." : "Error: No es pot iniciar el servidor integrat de Collabora Online, configureu-ne un de independent.",
diff --git a/l10n/el.js b/l10n/el.js
index 2e4b9850..c859cde2 100644
--- a/l10n/el.js
+++ b/l10n/el.js
@@ -94,6 +94,7 @@ OC.L10N.register(
     "Error: Cannot find the AppImage, please reinstall the Collabora Online Built-in server." : "Σφάλμα: Δεν είναι δυνατή η εύρεση του AppImage, εγκαταστήστε ξανά τον ενσωματωμένο διακομιστή Collabora Online.",
     "Error: Unable to make the AppImage executable, please setup a standalone server." : "Σφάλμα: Δεν είναι δυνατή η εκτέλεση του AppImage, ρυθμίστε έναν αυτόνομο διακομιστή.",
     "Error: Exec disabled in PHP, please enable it, or setup a standalone server." : "Σφάλμα: Το Exec απενεργοποιήθηκε στην PHP, ενεργοποιήστε το ή ρυθμίστε έναν αυτόνομο διακομιστή.",
+    "Error: Not running on x86-64 or ARM64 (aarch64) Linux, please setup a standalone server." : "Σφάλμα: Δεν μπορεί να εκτελεστεί σε x86-64 ή ARM64 (aarch64) Linux, παρακαλούμε  ρυθμίστε έναν αυτόνομο διακομιστή.",
     "Error: The fontconfig library is not installed on your server, please install it or setup a standalone server." : "Σφάλμα: Η βιβλιοθήκη fontconfig δεν είναι εγκατεστημένη στον διακομιστή σας, εγκαταστήστε την ή εγκαταστήστε έναν αυτόνομο διακομιστή.",
     "Error: Not running on glibc-based Linux, please setup a standalone server." : "Σφάλμα: Δεν εκτελείται σε Linux που βασίζεται σε glibc, παρακαλούμε ρυθμίστε έναν αυτόνομο διακομιστή.",
     "Error: Cannot start the Collabora Online Built-in server, please setup a standalone one." : "Σφάλμα: Δεν είναι δυνατή η έναρξη του ενσωματωμένου διακομιστή Collabora Online, ρυθμίστε έναν αυτόνομο.",
diff --git a/l10n/el.json b/l10n/el.json
index 0fb8c2bb..6c268fd7 100644
--- a/l10n/el.json
+++ b/l10n/el.json
@@ -92,6 +92,7 @@
     "Error: Cannot find the AppImage, please reinstall the Collabora Online Built-in server." : "Σφάλμα: Δεν είναι δυνατή η εύρεση του AppImage, εγκαταστήστε ξανά τον ενσωματωμένο διακομιστή Collabora Online.",
     "Error: Unable to make the AppImage executable, please setup a standalone server." : "Σφάλμα: Δεν είναι δυνατή η εκτέλεση του AppImage, ρυθμίστε έναν αυτόνομο διακομιστή.",
     "Error: Exec disabled in PHP, please enable it, or setup a standalone server." : "Σφάλμα: Το Exec απενεργοποιήθηκε στην PHP, ενεργοποιήστε το ή ρυθμίστε έναν αυτόνομο διακομιστή.",
+    "Error: Not running on x86-64 or ARM64 (aarch64) Linux, please setup a standalone server." : "Σφάλμα: Δεν μπορεί να εκτελεστεί σε x86-64 ή ARM64 (aarch64) Linux, παρακαλούμε  ρυθμίστε έναν αυτόνομο διακομιστή.",
     "Error: The fontconfig library is not installed on your server, please install it or setup a standalone server." : "Σφάλμα: Η βιβλιοθήκη fontconfig δεν είναι εγκατεστημένη στον διακομιστή σας, εγκαταστήστε την ή εγκαταστήστε έναν αυτόνομο διακομιστή.",
     "Error: Not running on glibc-based Linux, please setup a standalone server." : "Σφάλμα: Δεν εκτελείται σε Linux που βασίζεται σε glibc, παρακαλούμε ρυθμίστε έναν αυτόνομο διακομιστή.",
     "Error: Cannot start the Collabora Online Built-in server, please setup a standalone one." : "Σφάλμα: Δεν είναι δυνατή η έναρξη του ενσωματωμένου διακομιστή Collabora Online, ρυθμίστε έναν αυτόνομο.",
diff --git a/l10n/fr.js b/l10n/fr.js
index bdbe21fe..524a8d29 100644
--- a/l10n/fr.js
+++ b/l10n/fr.js
@@ -94,6 +94,7 @@ OC.L10N.register(
     "Error: Cannot find the AppImage, please reinstall the Collabora Online Built-in server." : "Erreur : Impossible de trouver l'AppImage, veuillez installer le serveur intégré Collabora Online à nouveau.",
     "Error: Unable to make the AppImage executable, please setup a standalone server." : "Erreur : Impossible de rendre l'AppImge exécutable, veuillez créer un serveur autonome.",
     "Error: Exec disabled in PHP, please enable it, or setup a standalone server." : "Erreur : L’exécution est désactivée dans PHP, veuillez l'activer, ou créer un serveur autonome.",
+    "Error: Not running on x86-64 or ARM64 (aarch64) Linux, please setup a standalone server." : "Erreur : Ne fonctionne pas sous x86-64 ou ARM64 (aarch64) Linux, veuillez créer un serveur autonome.",
     "Error: The fontconfig library is not installed on your server, please install it or setup a standalone server." : "Erreur : La bibliothèque fontconfig n’est pas installée sur votre serveur, veuillez l’installer ou configurer un serveur autonome.",
     "Error: Not running on glibc-based Linux, please setup a standalone server." : "Erreur : Ne fonctionne pas sur Linux basé sur glibc, veuillez configurer un serveur autonome.",
     "Error: Cannot start the Collabora Online Built-in server, please setup a standalone one." : "Erreur : Impossible de démarrer le serveur intégré Collabora Online, veuillez configurer un serveur autonome.",
diff --git a/l10n/fr.json b/l10n/fr.json
index 208b1e60..5fdbaa67 100644
--- a/l10n/fr.json
+++ b/l10n/fr.json
@@ -92,6 +92,7 @@
     "Error: Cannot find the AppImage, please reinstall the Collabora Online Built-in server." : "Erreur : Impossible de trouver l'AppImage, veuillez installer le serveur intégré Collabora Online à nouveau.",
     "Error: Unable to make the AppImage executable, please setup a standalone server." : "Erreur : Impossible de rendre l'AppImge exécutable, veuillez créer un serveur autonome.",
     "Error: Exec disabled in PHP, please enable it, or setup a standalone server." : "Erreur : L’exécution est désactivée dans PHP, veuillez l'activer, ou créer un serveur autonome.",
+    "Error: Not running on x86-64 or ARM64 (aarch64) Linux, please setup a standalone server." : "Erreur : Ne fonctionne pas sous x86-64 ou ARM64 (aarch64) Linux, veuillez créer un serveur autonome.",
     "Error: The fontconfig library is not installed on your server, please install it or setup a standalone server." : "Erreur : La bibliothèque fontconfig n’est pas installée sur votre serveur, veuillez l’installer ou configurer un serveur autonome.",
     "Error: Not running on glibc-based Linux, please setup a standalone server." : "Erreur : Ne fonctionne pas sur Linux basé sur glibc, veuillez configurer un serveur autonome.",
     "Error: Cannot start the Collabora Online Built-in server, please setup a standalone one." : "Erreur : Impossible de démarrer le serveur intégré Collabora Online, veuillez configurer un serveur autonome.",
diff --git a/l10n/pt_BR.js b/l10n/pt_BR.js
index 438aa073..e5913bf9 100644
--- a/l10n/pt_BR.js
+++ b/l10n/pt_BR.js
@@ -94,6 +94,7 @@ OC.L10N.register(
     "Error: Cannot find the AppImage, please reinstall the Collabora Online Built-in server." : "Erro: Não foi possível encontrar o AppImage, reinstale o servidor Collabora Online Incorporado.",
     "Error: Unable to make the AppImage executable, please setup a standalone server." : "Erro: Não foi possível tornar o AppImage executável, configure um servidor independente.",
     "Error: Exec disabled in PHP, please enable it, or setup a standalone server." : "Erro: Exec desativado no PHP. Ative-o ou configure um servidor independente.",
+    "Error: Not running on x86-64 or ARM64 (aarch64) Linux, please setup a standalone server." : "Erro: Não está rodando num Linux x86-64 ou ARM64 (aarch64). Configure um servidor autônomo.",
     "Error: The fontconfig library is not installed on your server, please install it or setup a standalone server." : "Erro: A biblioteca fontconfig não está instalada no seu servidor. Instale-a ou configure um servidor independente.",
     "Error: Not running on glibc-based Linux, please setup a standalone server." : "Erro: Não está executando num Linux baseado em glibc. Configure um servidor autônomo.",
     "Error: Cannot start the Collabora Online Built-in server, please setup a standalone one." : "Erro: Não foi possível iniciar o servidor Collabora Online integrado. Configure um servidor autônomo.",
diff --git a/l10n/pt_BR.json b/l10n/pt_BR.json
index 6a8605d5..053b199a 100644
--- a/l10n/pt_BR.json
+++ b/l10n/pt_BR.json
@@ -92,6 +92,7 @@
     "Error: Cannot find the AppImage, please reinstall the Collabora Online Built-in server." : "Erro: Não foi possível encontrar o AppImage, reinstale o servidor Collabora Online Incorporado.",
     "Error: Unable to make the AppImage executable, please setup a standalone server." : "Erro: Não foi possível tornar o AppImage executável, configure um servidor independente.",
     "Error: Exec disabled in PHP, please enable it, or setup a standalone server." : "Erro: Exec desativado no PHP. Ative-o ou configure um servidor independente.",
+    "Error: Not running on x86-64 or ARM64 (aarch64) Linux, please setup a standalone server." : "Erro: Não está rodando num Linux x86-64 ou ARM64 (aarch64). Configure um servidor autônomo.",
     "Error: The fontconfig library is not installed on your server, please install it or setup a standalone server." : "Erro: A biblioteca fontconfig não está instalada no seu servidor. Instale-a ou configure um servidor independente.",
     "Error: Not running on glibc-based Linux, please setup a standalone server." : "Erro: Não está executando num Linux baseado em glibc. Configure um servidor autônomo.",
     "Error: Cannot start the Collabora Online Built-in server, please setup a standalone one." : "Erro: Não foi possível iniciar o servidor Collabora Online integrado. Configure um servidor autônomo.",
diff --git a/l10n/tr.js b/l10n/tr.js
index c6fd784e..bc1f56af 100644
--- a/l10n/tr.js
+++ b/l10n/tr.js
@@ -94,6 +94,7 @@ OC.L10N.register(
     "Error: Cannot find the AppImage, please reinstall the Collabora Online Built-in server." : "Hata: AppImage bulunamadı. Lütfen Collabora Online iç sunucusunu yeniden kurun.",
     "Error: Unable to make the AppImage executable, please setup a standalone server." : "Hata: AppImage yütürülebilir yapılamadı. Lütfen ayrı bir sunucu kurun.",
     "Error: Exec disabled in PHP, please enable it, or setup a standalone server." : "Hata: PHP üzerinde Exec devre dışı bırakılmış. Lütfen etkinleştirin ya da ayrı bir sunucu kurun.",
+    "Error: Not running on x86-64 or ARM64 (aarch64) Linux, please setup a standalone server." : "Hata: x86-64 ya da ARM64 (aarch64) Linux üzerinde çalışmıyor. Lütfen ayrı bir sunucu kurun.",
     "Error: The fontconfig library is not installed on your server, please install it or setup a standalone server." : "Hata: Sunucunuzda fontconfig kitaplığı kurulu değil. Lütfen etkinleştirin ya da ayrı bir sunucu kurun.",
     "Error: Not running on glibc-based Linux, please setup a standalone server." : "Hata: glibc temelli Linux üzerinde çalışmıyor. Lütfen ayrı bir sunucu kurun.",
     "Error: Cannot start the Collabora Online Built-in server, please setup a standalone one." : "Hata: Collabora Online iç sunucusu başlatılamadı. Lütfen ayrı bir sunucu kurun.",
diff --git a/l10n/tr.json b/l10n/tr.json
index a94453f2..faee6223 100644
--- a/l10n/tr.json
+++ b/l10n/tr.json
@@ -92,6 +92,7 @@
     "Error: Cannot find the AppImage, please reinstall the Collabora Online Built-in server." : "Hata: AppImage bulunamadı. Lütfen Collabora Online iç sunucusunu yeniden kurun.",
     "Error: Unable to make the AppImage executable, please setup a standalone server." : "Hata: AppImage yütürülebilir yapılamadı. Lütfen ayrı bir sunucu kurun.",
     "Error: Exec disabled in PHP, please enable it, or setup a standalone server." : "Hata: PHP üzerinde Exec devre dışı bırakılmış. Lütfen etkinleştirin ya da ayrı bir sunucu kurun.",
+    "Error: Not running on x86-64 or ARM64 (aarch64) Linux, please setup a standalone server." : "Hata: x86-64 ya da ARM64 (aarch64) Linux üzerinde çalışmıyor. Lütfen ayrı bir sunucu kurun.",
     "Error: The fontconfig library is not installed on your server, please install it or setup a standalone server." : "Hata: Sunucunuzda fontconfig kitaplığı kurulu değil. Lütfen etkinleştirin ya da ayrı bir sunucu kurun.",
     "Error: Not running on glibc-based Linux, please setup a standalone server." : "Hata: glibc temelli Linux üzerinde çalışmıyor. Lütfen ayrı bir sunucu kurun.",
     "Error: Cannot start the Collabora Online Built-in server, please setup a standalone one." : "Hata: Collabora Online iç sunucusu başlatılamadı. Lütfen ayrı bir sunucu kurun.",
diff --git a/lib/Controller/WopiController.php b/lib/Controller/WopiController.php
index 03a6fb4c..e9c87e14 100644
--- a/lib/Controller/WopiController.php
+++ b/lib/Controller/WopiController.php
@@ -218,7 +218,7 @@ class WopiController extends Controller {
 		}
 
 		$user = $this->userManager->get($wopi->getEditorUid());
-		if($user !== null && $user->getAvatarImage(32) !== null) {
+		if($user !== null) {
 			$response['UserExtraInfo']['avatar'] = $this->urlGenerator->linkToRouteAbsolute('core.avatar.getAvatar', ['userId' => $wopi->getEditorUid(), 'size' => 32]);
 		}
 
diff --git a/lib/TokenManager.php b/lib/TokenManager.php
index 5cf085d9..3c39afd3 100644
--- a/lib/TokenManager.php
+++ b/lib/TokenManager.php
@@ -259,7 +259,7 @@ class TokenManager {
 		$serverHost = $this->urlGenerator->getAbsoluteURL('/');
 
 		if ($this->capabilitiesService->hasTemplateSource()) {
-			$wopi = $this->wopiMapper->generateFileToken($targetFile->getId(), $owneruid, $editoruid, 0, (int)$updatable, $serverHost, null, 0, false, false, false, $templateFile->getId());
+			$wopi = $this->wopiMapper->generateFileToken($targetFile->getId(), $owneruid, $editoruid, 0, (int)$updatable, $serverHost, null, 0, false, $direct, false, $templateFile->getId());
 		} else {
 			// Legacy way of creating new documents from a template
 			$wopi = $this->wopiMapper->generateFileToken($templateFile->getId(), $owneruid, $editoruid, 0, (int)$updatable, $serverHost, null, $targetFile->getId(), $direct);