Merge remote-tracking branch 'remotes/origin/develop' into feature/goback-in-viewerfeature/goback-in-viewer

31 files changed, 66 insertions, 37 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ce22134..6fc95cf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Change Log
 
+##
+## Added
+- macro launch setting
+
+## Changed
+- fix editor lang
+
 ## 7.3.4
 ## Added
 - Turkish and Galician empty file templates
diff --git a/controller/editorapicontroller.php b/controller/editorapicontroller.php
index a0208f9..bec6ac2 100644
--- a/controller/editorapicontroller.php
+++ b/controller/editorapicontroller.php
@@ -295,8 +295,8 @@ class EditorApiController extends OCSController {
             ],
             "documentType" => $format["type"],
             "editorConfig" => [
-                "lang" => str_replace("_", "-", \OC::$server->getL10NFactory()->get("onlyoffice")->getLanguageCode()),
-                "region" => str_replace("_", "-", \OC::$server->getL10NFactory()->get("onlyoffice")->getLocaleCode())
+                "lang" => str_replace("_", "-", \OC::$server->getL10NFactory()->get("")->getLanguageCode()),
+                "region" => str_replace("_", "-", \OC::$server->getL10NFactory()->get("")->getLocaleCode())
             ]
         ];
 
@@ -590,8 +590,7 @@ class EditorApiController extends OCSController {
 
         $fileUrl = $this->urlGenerator->linkToRouteAbsolute($this->appName . ".callback.download", ["doc" => $hashUrl]);
 
-        if (!empty($this->config->GetStorageUrl())
-            && !$changes) {
+        if (!empty($this->config->GetStorageUrl())) {
             $fileUrl = str_replace($this->urlGenerator->getAbsoluteURL("/"), $this->config->GetStorageUrl(), $fileUrl);
         }
 
@@ -655,6 +654,11 @@ class EditorApiController extends OCSController {
             $params["editorConfig"]["customization"]["toolbarNoTabs"] = true;
         }
 
+        //default is true
+        if($this->config->GetCustomizationMacros() === false) {
+            $params["editorConfig"]["customization"]["macros"] = false;
+        }
+
 
         /* from system config */
 
@@ -708,7 +712,7 @@ class EditorApiController extends OCSController {
 
         if ($watermarkTemplate !== false) {
             $replacements = [
-                "userId" => $userId,
+                "userId" => isset($userId) ? $userId : $this->trans->t('Anonymous'),
                 "date" => (new \DateTime())->format("Y-m-d H:i:s"),
                 "themingName" => \OC::$server->getThemingDefaults()->getName()
             ];
diff --git a/controller/editorcontroller.php b/controller/editorcontroller.php
index 14b4e25..7457c92 100644
--- a/controller/editorcontroller.php
+++ b/controller/editorcontroller.php
@@ -268,7 +268,7 @@ class EditorController extends Controller {
             $fileUrl = $this->getUrl($targetFile, $user, $shareToken);
 
             $ext = strtolower(pathinfo($name, PATHINFO_EXTENSION));
-            $region = str_replace("_", "-", \OC::$server->getL10NFactory()->get($this->appName)->getLocaleCode());
+            $region = str_replace("_", "-", \OC::$server->getL10NFactory()->get("")->getLocaleCode());
             $documentService = new DocumentService($this->trans, $this->config);
             try {
                 $newFileUri = $documentService->GetConvertedUri($fileUrl, $targetExt, $ext, $targetKey, $region);
@@ -592,7 +592,7 @@ class EditorController extends Controller {
         $documentService = new DocumentService($this->trans, $this->config);
         $key = $this->fileUtility->getKey($file);
         $fileUrl = $this->getUrl($file, $user, $shareToken);
-        $region = str_replace("_", "-", \OC::$server->getL10NFactory()->get($this->appName)->getLocaleCode());
+        $region = str_replace("_", "-", \OC::$server->getL10NFactory()->get("")->getLocaleCode());
         try {
             $newFileUri = $documentService->GetConvertedUri($fileUrl, $ext, $internalExtension, $key, $region);
         } catch (\Exception $e) {
@@ -1281,8 +1281,7 @@ class EditorController extends Controller {
 
         $fileUrl = $this->urlGenerator->linkToRouteAbsolute($this->appName . ".callback.download", ["doc" => $hashUrl]);
 
-        if (!empty($this->config->GetStorageUrl())
-            && !$changes) {
+        if (!empty($this->config->GetStorageUrl())) {
             $fileUrl = str_replace($this->urlGenerator->getAbsoluteURL("/"), $this->config->GetStorageUrl(), $fileUrl);
         }
 
diff --git a/controller/settingscontroller.php b/controller/settingscontroller.php
index 6f82553..adc6fe8 100644
--- a/controller/settingscontroller.php
+++ b/controller/settingscontroller.php
@@ -126,6 +126,7 @@ class SettingsController extends Controller {
             "toolbarNoTabs" => $this->config->GetCustomizationToolbarNoTabs(),
             "successful" => $this->config->SettingsAreSuccessful(),
             "watermark" => $this->config->GetWatermarkSettings(),
+            "macros" => $this->config->GetCustomizationMacros(),
             "tagsEnabled" => App::isEnabled("systemtags"),
             "reviewDisplay" => $this->config->GetCustomizationReviewDisplay(),
             "templates" => $this->GetGlobalTemplates()
@@ -200,6 +201,7 @@ class SettingsController extends Controller {
      * @param bool $forcesave - forcesave
      * @param bool $help - display help
      * @param bool $toolbarNoTabs - display toolbar tab
+     * @param bool $macros - run document macros
      * @param string $reviewDisplay - review viewing mode
      *
      * @return array
@@ -216,6 +218,7 @@ class SettingsController extends Controller {
                                     $forcesave,
                                     $help,
                                     $toolbarNoTabs,
+                                    $macros,
                                     $reviewDisplay
                                     ) {
 
@@ -231,6 +234,7 @@ class SettingsController extends Controller {
         $this->config->SetCustomizationForcesave($forcesave);
         $this->config->SetCustomizationHelp($help);
         $this->config->SetCustomizationToolbarNoTabs($toolbarNoTabs);
+        $this->config->SetCustomizationMacros($macros);
         $this->config->SetCustomizationReviewDisplay($reviewDisplay);
 
         return [
diff --git a/js/settings.js b/js/settings.js
index f8d3d42..c607d08 100644
--- a/js/settings.js
+++ b/js/settings.js
@@ -202,6 +202,7 @@
             var forcesave = $("#onlyofficeForcesave").is(":checked");
             var help = $("#onlyofficeHelp").is(":checked");
             var toolbarNoTabs = $("#onlyofficeToolbarNoTabs").is(":checked");
+            var macros = $("#onlyofficeMacros").is(":checked");
             var reviewDisplay = $("input[type='radio'][name='reviewDisplay']:checked").attr("id").replace("onlyofficeReviewDisplay_", "");
 
             $.ajax({
@@ -220,6 +221,7 @@
                     forcesave: forcesave,
                     help: help,
                     toolbarNoTabs: toolbarNoTabs,
+                    macros: macros,
                     reviewDisplay: reviewDisplay
                 },
                 success: function onSuccess(response) {
diff --git a/l10n/bg.js b/l10n/bg.js
index 74f131e..275759a 100644
--- a/l10n/bg.js
+++ b/l10n/bg.js
@@ -62,7 +62,6 @@ OC.L10N.register(
     "This is a public test server, please do not use it for private sensitive data. The server will be available during a 30-day period." : "Това е обществен тестов сървър, моля, не използвайте за чувствителни частни данни. Сървърът ще е на разположение по време на 30-дневния период.",
     "The 30-day test period is over, you can no longer connect to demo ONLYOFFICE Docs server." : "30-дневният тестов период приключи, вече не можете да се свържете с демо ONLYOFFICE Docs сървър.",
     "You are using public demo ONLYOFFICE Docs server. Please do not store private sensitive data." : "Използвате обществения демо ONLYOFFICE Docs сървър. Моля, не съхранявайте чувствителни частни данни на него.",
-    "Secure view settings" : "Настройки за защитен изглед",
     "Secure view enables you to secure documents by embedding a watermark" : "Защитеният изглед активира вашите защитени документи, като вгражда в тях воден знак",
     "Enable watermarking" : "Активиране на воден знак",
     "Watermark text" : "Текст на водния знак",
diff --git a/l10n/bg.json b/l10n/bg.json
index d3c038a..a385044 100644
--- a/l10n/bg.json
+++ b/l10n/bg.json
@@ -60,7 +60,6 @@
     "This is a public test server, please do not use it for private sensitive data. The server will be available during a 30-day period.": "Това е обществен тестов сървър, моля, не използвайте за чувствителни частни данни. Сървърът ще е на разположение по време на 30-дневния период.",
     "The 30-day test period is over, you can no longer connect to demo ONLYOFFICE Docs server.": "30-дневният тестов период приключи, вече не можете да се свържете с демо ONLYOFFICE Docs сървър.",
     "You are using public demo ONLYOFFICE Docs server. Please do not store private sensitive data.": "Използвате обществения демо ONLYOFFICE Docs сървър. Моля, не съхранявайте чувствителни частни данни на него.",
-    "Secure view settings": "Настройки за защитен изглед",
     "Secure view enables you to secure documents by embedding a watermark": "Защитеният изглед активира вашите защитени документи, като вгражда в тях воден знак",
     "Enable watermarking": "Активиране на воден знак",
     "Watermark text": "Текст на водния знак",
diff --git a/l10n/de.js b/l10n/de.js
index 07ce0bb..d28ede4 100644
--- a/l10n/de.js
+++ b/l10n/de.js
@@ -62,7 +62,6 @@ OC.L10N.register(
     "This is a public test server, please do not use it for private sensitive data. The server will be available during a 30-day period." : "Dies ist ein öffentlicher Testserver. Bitte verwende beim Testen keine privaten sensiblen Daten. Der Server ist 30 Tage lang verfügbar.",
     "The 30-day test period is over, you can no longer connect to demo ONLYOFFICE Docs server." : "Der 30-tägige Testzeitraum ist abgelaufen. Du kannst keine Verbindung mehr zu Demo ONLYOFFICE Docs Server herstellen.",
     "You are using public demo ONLYOFFICE Docs server. Please do not store private sensitive data." : "Du verwendest den öffentlichen Demo ONLYOFFICE Docs Server. Bitte benutze ihn nicht zum Speichern von Deinen privaten sensiblen Daten.",
-    "Secure view settings" : "Einstellungen für Sichere Ansicht",
     "Secure view enables you to secure documents by embedding a watermark" : "Sichere Ansicht ermöglicht Dir Dokumente durch Einbettung eines Wasserzeichens abzusichern",
     "Enable watermarking" : "Wasserzeichenmarkierung aktivieren",
     "Watermark text" : "Wasserzeichen-Text",
diff --git a/l10n/de.json b/l10n/de.json
index 6b01cac..7fdfa60 100644
--- a/l10n/de.json
+++ b/l10n/de.json
@@ -60,7 +60,6 @@
     "This is a public test server, please do not use it for private sensitive data. The server will be available during a 30-day period." : "Dies ist ein öffentlicher Testserver. Bitte verwende beim Testen keine privaten sensiblen Daten. Der Server ist 30 Tage lang verfügbar.",
     "The 30-day test period is over, you can no longer connect to demo ONLYOFFICE Docs server." : "Der 30-tägige Testzeitraum ist abgelaufen. Du kannst keine Verbindung mehr zu Demo ONLYOFFICE Docs Server herstellen.",
     "You are using public demo ONLYOFFICE Docs server. Please do not store private sensitive data." : "Du verwendest den öffentlichen Demo ONLYOFFICE Docs Server. Bitte benutze ihn nicht zum Speichern von Deinen privaten sensiblen Daten.",
-    "Secure view settings" : "Einstellungen für Sichere Ansicht",
     "Secure view enables you to secure documents by embedding a watermark" : "Sichere Ansicht ermöglicht Dir Dokumente durch Einbettung eines Wasserzeichens abzusichern",
     "Enable watermarking" : "Wasserzeichenmarkierung aktivieren",
     "Watermark text" : "Wasserzeichen-Text",
diff --git a/l10n/de_DE.js b/l10n/de_DE.js
index 03354fb..740399b 100644
--- a/l10n/de_DE.js
+++ b/l10n/de_DE.js
@@ -62,7 +62,6 @@ OC.L10N.register(
     "This is a public test server, please do not use it for private sensitive data. The server will be available during a 30-day period." : "Dies ist ein öffentlicher Testserver. Bitte verwenden Sie beim Testen keine privaten sensiblen Daten. Der Server ist 30 Tage lang verfügbar.",
     "The 30-day test period is over, you can no longer connect to demo ONLYOFFICE Docs server.": "Der 30-tägige Testzeitraum ist abgelaufen. Sie können keine Verbindung mehr zu Demo ONLYOFFICE Docs Server herstellen.",
     "You are using public demo ONLYOFFICE Docs server. Please do not store private sensitive data.": "Sie verwenden den öffentlichen Demo ONLYOFFICE Docs Server. Bitte benutzen Sie ihn nicht zum Speichern von Ihren privaten sensiblen Daten.",
-    "Secure view settings" : "Einstellungen für Sichere Ansicht",
     "Secure view enables you to secure documents by embedding a watermark" : "Sichere Ansicht ermöglicht Ihnen Dokumente durch Einbettung eines Wasserzeichens abzusichern",
     "Enable watermarking" : "Wasserzeichenmarkierung aktivieren",
     "Watermark text" : "Wasserzeichen-Text",
diff --git a/l10n/de_DE.json b/l10n/de_DE.json
index 41f8cf5..5992357 100644
--- a/l10n/de_DE.json
+++ b/l10n/de_DE.json
@@ -60,7 +60,6 @@
     "This is a public test server, please do not use it for private sensitive data. The server will be available during a 30-day period." : "Dies ist ein öffentlicher Testserver. Bitte verwenden Sie beim Testen keine privaten sensiblen Daten. Der Server ist 30 Tage lang verfügbar.",
     "The 30-day test period is over, you can no longer connect to demo ONLYOFFICE Docs server.": "Der 30-tägige Testzeitraum ist abgelaufen. Sie können keine Verbindung mehr zu Demo ONLYOFFICE Docs Server herstellen.",
     "You are using public demo ONLYOFFICE Docs server. Please do not store private sensitive data.": "Sie verwenden den öffentlichen Demo ONLYOFFICE Docs Server. Bitte benutzen Sie ihn nicht zum Speichern von Ihren privaten sensiblen Daten.",
-    "Secure view settings" : "Einstellungen für Sichere Ansicht",
     "Secure view enables you to secure documents by embedding a watermark" : "Sichere Ansicht ermöglicht Ihnen Dokumente durch Einbettung eines Wasserzeichens abzusichern",
     "Enable watermarking" : "Wasserzeichenmarkierung aktivieren",
     "Watermark text" : "Wasserzeichen-Text",
diff --git a/l10n/es.js b/l10n/es.js
index 5b09ce6..c5d7a1e 100644
--- a/l10n/es.js
+++ b/l10n/es.js
@@ -62,7 +62,6 @@ OC.L10N.register(
     "This is a public test server, please do not use it for private sensitive data. The server will be available during a 30-day period." : "Este es un servidor de pruebas público, por favor no lo uses para tus datos confidenciales. El servidor estará disponible durante un período de 30 días.",
     "The 30-day test period is over, you can no longer connect to demo ONLYOFFICE Docs server." : "El período de prueba de 30 días ha terminado, ya no puedes conectarte al servidor de ONLYOFFICE Docs de demostración",
     "You are using public demo ONLYOFFICE Docs server. Please do not store private sensitive data." : "Estás usando el servidor de ONLYOFFICE Docs de demostración. Por favor, no almacenes tus datos confidenciales aquí.",
-    "Secure view settings" : "Configuración de visualización segura",
     "Secure view enables you to secure documents by embedding a watermark" : "La vista segura permite asegurar documentos mediante la inserción de una marca de agua en ellos",
     "Enable watermarking" : "Habilitar marcas de agua",
     "Watermark text" : "Texto de marca de agua", 
diff --git a/l10n/es.json b/l10n/es.json
index c032fce..b6fef4a 100644
--- a/l10n/es.json
+++ b/l10n/es.json
@@ -60,7 +60,6 @@
     "This is a public test server, please do not use it for private sensitive data. The server will be available during a 30-day period." : "Este es un servidor de pruebas público, por favor no lo uses para tus datos confidenciales. El servidor estará disponible durante un período de 30 días.",
     "The 30-day test period is over, you can no longer connect to demo ONLYOFFICE Docs server." : "El período de prueba de 30 días ha terminado, ya no puedes conectarte al servidor de ONLYOFFICE Docs de demostración",
     "You are using public demo ONLYOFFICE Docs server. Please do not store private sensitive data." : "Estás usando el servidor de ONLYOFFICE Docs de demostración. Por favor, no almacenes tus datos confidenciales aquí.",
-    "Secure view settings" : "Configuración de visualización segura",
     "Secure view enables you to secure documents by embedding a watermark" : "La vista segura permite asegurar documentos mediante la inserción de una marca de agua en ellos",
     "Enable watermarking" : "Habilitar marcas de agua",
     "Watermark text" : "Texto de marca de agua", 
diff --git a/l10n/fr.js b/l10n/fr.js
index 362daa9..0b47f31 100644
--- a/l10n/fr.js
+++ b/l10n/fr.js
@@ -62,7 +62,6 @@ OC.L10N.register(
     "This is a public test server, please do not use it for private sensitive data. The server will be available during a 30-day period." : "C’est un serveur public proposé à des fins de tests, veuillez ne pas l’utiliser pour vos données personnelles sensibles. Le serveur est disponible pendant 30 jours.",
     "The 30-day test period is over, you can no longer connect to demo ONLYOFFICE Docs server." : "La période d’essai de 30 jours est expirée, vous n’êtes plus en mesure de vous connecter à la version démo de ONLYOFFICE Docs.",
     "You are using public demo ONLYOFFICE Docs server. Please do not store private sensitive data." : "Vous utilisez la version démo de ONLYOFFICE Docs, proposée à des fins de tests. Veuillez ne pas stocker vos données confidentielles.",
-    "Secure view settings" : "Paramètres d’affichage sécurisé",
     "Secure view enables you to secure documents by embedding a watermark" : "L’affichage sécurisé permet de protéger vos documents à l’aide d’un filigrane.",
     "Enable watermarking" : "Activer un filigrane",
     "Watermark text" : "Texte du filigrane",
diff --git a/l10n/fr.json b/l10n/fr.json
index 41ef6b3..0ac6c12 100644
--- a/l10n/fr.json
+++ b/l10n/fr.json
@@ -60,7 +60,6 @@
     "This is a public test server, please do not use it for private sensitive data. The server will be available during a 30-day period." : "C’est un serveur public proposé à des fins de tests, veuillez ne pas l’utiliser pour vos données personnelles sensibles. Le serveur est disponible pendant 30 jours.",
     "The 30-day test period is over, you can no longer connect to demo ONLYOFFICE Docs server." : "La période d’essai de 30 jours est expirée, vous n’êtes plus en mesure de vous connecter à la version démo de ONLYOFFICE Docs.",
     "You are using public demo ONLYOFFICE Docs server. Please do not store private sensitive data." : "Vous utilisez la version démo de ONLYOFFICE Docs, proposée à des fins de tests. Veuillez ne pas stocker vos données confidentielles.",
-    "Secure view settings" : "Paramètres d’affichage sécurisé",
     "Secure view enables you to secure documents by embedding a watermark" : "L’affichage sécurisé permet de protéger vos documents à l’aide d’un filigrane.",
     "Enable watermarking" : "Activer un filigrane",
     "Watermark text" : "Texte du filigrane",
diff --git a/l10n/it.js b/l10n/it.js
index 29789ec..f3a1fdd 100644
--- a/l10n/it.js
+++ b/l10n/it.js
@@ -62,7 +62,6 @@ OC.L10N.register(
     "This is a public test server, please do not use it for private sensitive data. The server will be available during a 30-day period.": "Questo è un server di prova pubblico, non utilizzarlo per dati sensibili privati. Il server sarà disponibile per un periodo di 30 giorni.",
     "The 30-day test period is over, you can no longer connect to demo ONLYOFFICE Docs server." : "Il periodo di prova di 30 giorni è terminato; non è più possibile connettersi alla versione demo di ONLYOFFICE Docs.",
     "You are using public demo ONLYOFFICE Docs server. Please do not store private sensitive data." : "Stai utilizzando la versione demo pubblica di ONLYOFFICE Docs. Non memorizzare dati sensibili privati.",
-    "Secure view settings" : "Impostazioni di visualizzazione sicura",
     "Secure view enables you to secure documents by embedding a watermark" : "La visualizzazione sicura consente di proteggere i documenti inserendo una filigrana",
     "Enable watermarking" : "Abilita la filigrana",
     "Watermark text" : "Testo della filigrana",
diff --git a/l10n/it.json b/l10n/it.json
index 11001d7..ba13688 100644
--- a/l10n/it.json
+++ b/l10n/it.json
@@ -60,7 +60,6 @@
     "This is a public test server, please do not use it for private sensitive data. The server will be available during a 30-day period.": "Questo è un server di prova pubblico, non utilizzarlo per dati sensibili privati. Il server sarà disponibile per un periodo di 30 giorni.",
     "The 30-day test period is over, you can no longer connect to demo ONLYOFFICE Docs server." : "Il periodo di prova di 30 giorni è terminato; non è più possibile connettersi alla versione demo di ONLYOFFICE Docs.",
     "You are using public demo ONLYOFFICE Docs server. Please do not store private sensitive data." : "Stai utilizzando la versione demo pubblica di ONLYOFFICE Docs. Non memorizzare dati sensibili privati.",
-    "Secure view settings" : "Impostazioni di visualizzazione sicura",
     "Secure view enables you to secure documents by embedding a watermark" : "La visualizzazione sicura consente di proteggere i documenti inserendo una filigrana",
     "Enable watermarking" : "Abilita la filigrana",
     "Watermark text" : "Testo della filigrana",
diff --git a/l10n/ja.js b/l10n/ja.js
index 9c55b37..0056275 100644
--- a/l10n/ja.js
+++ b/l10n/ja.js
@@ -62,7 +62,6 @@ OC.L10N.register(
     "This is a public test server, please do not use it for private sensitive data. The server will be available during a 30-day period.": "これはパブリックテストサーバーです。プライベートな機密データには使用しないでください。サーバーを30日間、利用できます。",
     "The 30-day test period is over, you can no longer connect to demo ONLYOFFICE Docs server." : "30日間のテスト期間が終了したら、ONLYOFFICE Docs デモサーバーには繋がらなくなります。",
     "You are using public demo ONLYOFFICE Docs server. Please do not store private sensitive data." : "パブリック ONLYOFFICE Docs サーバーを使っているので、プライベートな機密データを利用しないようにしてください。",
-    "Secure view settings" : "セキュアビュー設定",
     "Secure view enables you to secure documents by embedding a watermark" : "セキュアビューでドキュメント透かしを埋め込んでドキュメントを保護します",
     "Enable watermarking" : "透かしを有効",
     "Watermark text" : "透かしテキスト",
diff --git a/l10n/ja.json b/l10n/ja.json
index ee74a3d..f6a4140 100644
--- a/l10n/ja.json
+++ b/l10n/ja.json
@@ -60,7 +60,6 @@
     "This is a public test server, please do not use it for private sensitive data. The server will be available during a 30-day period.": "これはパブリックテストサーバーです。プライベートな機密データには使用しないでください。サーバーを30日間、利用できます。",
     "The 30-day test period is over, you can no longer connect to demo ONLYOFFICE Docs server." : "30日間のテスト期間が終了したら、ONLYOFFICE Docs デモサーバーには繋がらなくなります。",
     "You are using public demo ONLYOFFICE Docs server. Please do not store private sensitive data." : "パブリック ONLYOFFICE Docs サーバーを使っているので、プライベートな機密データを利用しないようにしてください。",
-    "Secure view settings" : "セキュアビュー設定",
     "Secure view enables you to secure documents by embedding a watermark" : "セキュアビューでドキュメント透かしを埋め込んでドキュメントを保護します",
     "Enable watermarking" : "透かしを有効",
     "Watermark text" : "透かしテキスト",
diff --git a/l10n/pl.js b/l10n/pl.js
index d211310..8910a35 100644
--- a/l10n/pl.js
+++ b/l10n/pl.js
@@ -62,7 +62,6 @@ OC.L10N.register(
     "This is a public test server, please do not use it for private sensitive data. The server will be available during a 30-day period." : "To jest publiczny testowy serwer, proszę nie używać go do prywatnych danych. Serwer będzie dostępny przez 30 dni.",

     "The 30-day test period is over, you can no longer connect to demo ONLYOFFICE Docs server." : "Upłyneło 30 dni, nie możesz się już łączyć z serwerem demo.",

     "You are using public demo ONLYOFFICE Docs server. Please do not store private sensitive data." : "Używasz publicznego serwera demo. Nie przechowuj tu prywatnych danych.",

-    "Secure view settings" : "Ustawienia bezpiecznego widoku",

     "Secure view enables you to secure documents by embedding a watermark" : "Bezpieczny widok pozwala na zabezpieczenie dokumentów poprzez dodanie znaku wodnego",

     "Enable watermarking" : "Włącz znaki wodne",

     "Watermark text" : "Tekst znaku wodnego",

diff --git a/l10n/pl.json b/l10n/pl.json
index bea2992..627c00b 100644
--- a/l10n/pl.json
+++ b/l10n/pl.json
@@ -60,7 +60,6 @@
     "This is a public test server, please do not use it for private sensitive data. The server will be available during a 30-day period." : "To jest publiczny testowy serwer, proszę nie używać go do prywatnych danych. Serwer będzie dostępny przez 30 dni.",

     "The 30-day test period is over, you can no longer connect to demo ONLYOFFICE Docs server." : "Upłyneło 30 dni, nie możesz się już łączyć z serwerem demo.",

     "You are using public demo ONLYOFFICE Docs server. Please do not store private sensitive data." : "Używasz publicznego serwera demo. Nie przechowuj tu prywatnych danych.",

-    "Secure view settings" : "Ustawienia bezpiecznego widoku",

     "Secure view enables you to secure documents by embedding a watermark" : "Bezpieczny widok pozwala na zabezpieczenie dokumentów poprzez dodanie znaku wodnego",

     "Enable watermarking" : "Włącz znaki wodne",

     "Watermark text" : "Tekst znaku wodnego",

diff --git a/l10n/pt_BR.js b/l10n/pt_BR.js
index 825ef86..ca516c4 100644
--- a/l10n/pt_BR.js
+++ b/l10n/pt_BR.js
@@ -62,7 +62,6 @@ OC.L10N.register(
     "This is a public test server, please do not use it for private sensitive data. The server will be available during a 30-day period." : "Este é um servidor de teste público, não o use para dados confidenciais. O servidor estará disponível por um período de 30 dias.",
     "The 30-day test period is over, you can no longer connect to demo ONLYOFFICE Docs server." : "O período de teste de 30 dias acabou, você não pode mais se conectar ao Servidor de demonstração do ONLYOFFICE Docs",
     "You are using public demo ONLYOFFICE Docs server. Please do not store private sensitive data." : "Você está usando o Servidor de demonstração pública. Não armazene dados confidenciais.",
-    "Secure view settings" : "Configurações de visualização segura",
     "Secure view enables you to secure documents by embedding a watermark" : "A visualização segura permite proteger documentos incorporando uma marca d'água",
     "Enable watermarking" : "Ativar marca d'água",
     "Watermark text" : "Texto de marca d'água",
diff --git a/l10n/pt_BR.json b/l10n/pt_BR.json
index 11c99b4..e24cbb2 100644
--- a/l10n/pt_BR.json
+++ b/l10n/pt_BR.json
@@ -60,7 +60,6 @@
     "This is a public test server, please do not use it for private sensitive data. The server will be available during a 30-day period." : "Este é um servidor de teste público, não o use para dados confidenciais. O servidor estará disponível por um período de 30 dias.",
     "The 30-day test period is over, you can no longer connect to demo ONLYOFFICE Docs server." : "O período de teste de 30 dias acabou, você não pode mais se conectar ao Servidor de demonstração do ONLYOFFICE Docs",
     "You are using public demo ONLYOFFICE Docs server. Please do not store private sensitive data." : "Você está usando o Servidor de demonstração pública. Não armazene dados confidenciais.",
-    "Secure view settings" : "Configurações de visualização segura",
     "Secure view enables you to secure documents by embedding a watermark" : "A visualização segura permite proteger documentos incorporando uma marca d'água",
     "Enable watermarking" : "Ativar marca d'água",
     "Watermark text" : "Texto de marca d'água",
diff --git a/l10n/ru.js b/l10n/ru.js
index 1e4c38d..fe9e1d7 100644
--- a/l10n/ru.js
+++ b/l10n/ru.js
@@ -62,7 +62,6 @@ OC.L10N.register(
     "This is a public test server, please do not use it for private sensitive data. The server will be available during a 30-day period." : "Это публичный тестовый сервер, пожалуйста, не используйте его для личных конфиденциальных данных. Сервер будет доступен в течение 30 дней.",
     "The 30-day test period is over, you can no longer connect to demo ONLYOFFICE Docs server." : "30-дневный тестовый период закончен, вы больше не можете подключаться к демонстрационному серверу ONLYOFFICE Docs",
     "You are using public demo ONLYOFFICE Docs server. Please do not store private sensitive data." : "Вы используете публичный демонстрационный сервер ONLYOFFICE Docs. Пожалуйста, не храните конфиденциальные данные.",
-    "Secure view settings" : "Настройки безопасного просмотра",
     "Secure view enables you to secure documents by embedding a watermark" : "Безопасный просмотр позволяет защищать ваши документы путем встраивания водяного знака",
     "Enable watermarking" : "Включить водяной знак",
     "Watermark text" : "Текст водяного знака",
@@ -116,6 +115,8 @@ OC.L10N.register(
     "Create new Form template": "Создать новый Шаблон формы",
     "Create form": "Создать форму",
     "Fill in form in ONLYOFFICE": "Заполнить форму в ONLYOFFICE",
-    "Please update ONLYOFFICE Docs to version 7.0 to work on fillable forms online": "Обновите сервер ONLYOFFICE Docs до версии 7.0 для работы с формами онлайн"
+    "Please update ONLYOFFICE Docs to version 7.0 to work on fillable forms online": "Обновите сервер ONLYOFFICE Docs до версии 7.0 для работы с формами онлайн",
+    "Security": "Безопасность",
+    "Anonymous": "Аноним"
 },
 "nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);");
diff --git a/l10n/ru.json b/l10n/ru.json
index 5c4c735..6a9ba8d 100644
--- a/l10n/ru.json
+++ b/l10n/ru.json
@@ -60,7 +60,6 @@
     "This is a public test server, please do not use it for private sensitive data. The server will be available during a 30-day period." : "Это публичный тестовый сервер, пожалуйста, не используйте его для личных конфиденциальных данных. Сервер будет доступен в течение 30 дней.",
     "The 30-day test period is over, you can no longer connect to demo ONLYOFFICE Docs server." : "30-дневный тестовый период закончен, вы больше не можете подключаться к демонстрационному серверу ONLYOFFICE Docs",
     "You are using public demo ONLYOFFICE Docs server. Please do not store private sensitive data." : "Вы используете публичный демонстрационный сервер ONLYOFFICE Docs. Пожалуйста, не храните конфиденциальные данные.",
-    "Secure view settings" : "Настройки безопасного просмотра",
     "Secure view enables you to secure documents by embedding a watermark" : "Безопасный просмотр позволяет защищать ваши документы путем встраивания водяного знака",
     "Enable watermarking" : "Включить водяной знак",
     "Watermark text" : "Текст водяного знака",
@@ -114,6 +113,8 @@
     "Create new Form template": "Создать новый Шаблон формы",
     "Create form": "Создать форму",
     "Fill in form in ONLYOFFICE": "Заполнить форму в ONLYOFFICE",
-    "Please update ONLYOFFICE Docs to version 7.0 to work on fillable forms online": "Обновите сервер ONLYOFFICE Docs до версии 7.0 для работы с формами онлайн"
+    "Please update ONLYOFFICE Docs to version 7.0 to work on fillable forms online": "Обновите сервер ONLYOFFICE Docs до версии 7.0 для работы с формами онлайн",
+    "Security": "Безопасность",
+    "Anonymous": "Аноним"
 },"pluralForm" :"nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);"
 }
\ No newline at end of file
diff --git a/l10n/sv.js b/l10n/sv.js
index 50e04a0..796f12b 100644
--- a/l10n/sv.js
+++ b/l10n/sv.js
@@ -62,7 +62,6 @@ OC.L10N.register(
     "This is a public test server, please do not use it for private sensitive data. The server will be available during a 30-day period." : "Detta är en offentlig testserver, använd den inte för privat känslig information. Servern kommer att finnas tillgänglig under en 30-dagarsperiod.",
     "The 30-day test period is over, you can no longer connect to demo ONLYOFFICE Docs server." : "När 30-dagars testperioden är över, kan du inte längre ansluta till demo ONLYOFFICE Docsserver.",
     "You are using public demo ONLYOFFICE Docs server. Please do not store private sensitive data." : "Du använder en offentlig demo ONLYOFFICE Docsserver. Lagra inte privat känslig information.",
-    "Secure view settings" : "Säkra vyinställningar",
     "Secure view enables you to secure documents by embedding a watermark" : "Med säker vy kan du säkra dokument genom att bädda in en vattenstämpel",
     "Enable watermarking" : "Aktivera vattenstämpel",
     "Watermark text" : "Text för vattenmärke",
diff --git a/l10n/sv.json b/l10n/sv.json
index 494c28d..0a5f150 100644
--- a/l10n/sv.json
+++ b/l10n/sv.json
@@ -60,7 +60,6 @@
     "This is a public test server, please do not use it for private sensitive data. The server will be available during a 30-day period." : "Detta är en offentlig testserver, använd den inte för privat känslig information. Servern kommer att finnas tillgänglig under en 30-dagarsperiod.",
     "The 30-day test period is over, you can no longer connect to demo ONLYOFFICE Docs server." : "När 30-dagars testperioden är över, kan du inte längre ansluta till demo ONLYOFFICE Docsserver.",
     "You are using public demo ONLYOFFICE Docs server. Please do not store private sensitive data." : "Du använder en offentlig demo ONLYOFFICE Docsserver. Lagra inte privat känslig information.",
-    "Secure view settings" : "Säkra vyinställningar",
     "Secure view enables you to secure documents by embedding a watermark" : "Med säker vy kan du säkra dokument genom att bädda in en vattenstämpel",
     "Enable watermarking" : "Aktivera vattenstämpel",
     "Watermark text" : "Text för vattenmärke",
diff --git a/l10n/zh_CN.js b/l10n/zh_CN.js
index eb37a03..2c7057f 100644
--- a/l10n/zh_CN.js
+++ b/l10n/zh_CN.js
@@ -62,7 +62,6 @@ OC.L10N.register(
     "This is a public test server, please do not use it for private sensitive data. The server will be available during a 30-day period." : "这是公开的测试服务器，请勿用于隐私数据。服务器试用期限为30天。",
     "The 30-day test period is over, you can no longer connect to demo ONLYOFFICE Docs server." : "30天试用期已结束，无法连接ONLYOFFICE Docs 服务器的演示。",
     "You are using public demo ONLYOFFICE Docs server. Please do not store private sensitive data." : "您正在使用公开ONLYOFFICE Docs服务器的演示，请勿存储隐私数据。",
-    "Secure view settings" : "安全视图设置",
     "Secure view enables you to secure documents by embedding a watermark" : "启用安全视图可通过水印来保障文档安全",
     "Enable watermarking" : "启用水印",
     "Watermark text" : "水印文本",
diff --git a/l10n/zh_CN.json b/l10n/zh_CN.json
index 84f3261..a4977ff 100644
--- a/l10n/zh_CN.json
+++ b/l10n/zh_CN.json
@@ -60,7 +60,6 @@
     "This is a public test server, please do not use it for private sensitive data. The server will be available during a 30-day period.": "这是公开的测试服务器，请勿用于隐私数据。服务器试用期限为30天。",
     "The 30-day test period is over, you can no longer connect to demo ONLYOFFICE Docs server." : "30天试用期已结束，无法连接ONLYOFFICE Docs 服务器的演示。",
     "You are using public demo ONLYOFFICE Docs server. Please do not store private sensitive data." : "您正在使用公开ONLYOFFICE Docs服务器的演示，请勿存储隐私数据。",
-    "Secure view settings" : "安全视图设置",
     "Secure view enables you to secure documents by embedding a watermark" : "启用安全视图可通过水印来保障文档安全",
     "Enable watermarking" : "启用水印",
     "Watermark text" : "水印文本",
diff --git a/lib/appconfig.php b/lib/appconfig.php
index 620c4ca..d9cfe83 100644
--- a/lib/appconfig.php
+++ b/lib/appconfig.php
@@ -278,6 +278,13 @@ class AppConfig {
     public $_customization_goback = "customization_goback";
 
     /**
+     * The config key for the macros
+     *
+     * @var string
+     */
+    public $_customizationMacros = "customization_macros";
+
+    /**
      * @param string $AppName - application name
      */
     public function __construct($AppName) {
@@ -875,7 +882,7 @@ class AppConfig {
      */
     public function GetWatermarkSettings() {
         $result = [
-            "text" => $this->config->getAppValue(AppConfig::WATERMARK_APP_NAMESPACE, "watermark_text", "{userId}"),
+            "text" => $this->config->getAppValue(AppConfig::WATERMARK_APP_NAMESPACE, "watermark_text", "{userId}, {date}"),
         ];
 
         $watermarkLabels = [
@@ -1090,6 +1097,25 @@ class AppConfig {
         return $result;
     }
 
+    /**
+     * Save macros setting
+     *
+     * @param bool $value - enable macros
+     */
+    public function SetCustomizationMacros($value) {
+        $this->logger->info("Set macros enabled: " . json_encode($value), ["app" => $this->appName]);
+
+        $this->config->setAppValue($this->appName, $this->_customizationMacros, json_encode($value));
+    }
+
+    /**
+     * Get macros setting
+     *
+     * @return bool
+     */
+    public function GetCustomizationMacros() {
+        return $this->config->getAppValue($this->appName, $this->_customizationMacros, "true") === "true";
+    }
 
     /**
      * Additional data about formats
diff --git a/templates/settings.php b/templates/settings.php
index 2b9caae..bcc5f0f 100644
--- a/templates/settings.php
+++ b/templates/settings.php
@@ -251,8 +251,15 @@
 </div>
 
 <div class="section section-onlyoffice section-onlyoffice-watermark <?php if (empty($_["documentserver"]) && !$_["demo"]["enabled"] || !$_["successful"]) { ?>onlyoffice-hide<?php } ?>">
-    <h2><?php p($l->t("Secure view settings")) ?></h2>
+    <h2><?php p($l->t("Security")) ?></h2>
 
+    <p>
+        <input type="checkbox" class="checkbox" id="onlyofficeMacros"
+            <?php if ($_["macros"]) { ?>checked="checked"<?php } ?> />
+        <label for="onlyofficeMacros"><?php p($l->t("Run document macros")) ?></label>
+    </p>
+
+    <br />
     <p class="settings-hint"><?php p($l->t("Secure view enables you to secure documents by embedding a watermark")) ?></p>
 
     <p>