From dc1e33678b3d09ec812d6958a75073ffa4353dcd Mon Sep 17 00:00:00 2001
From: Stephane de Labrusse <stephdl@de-labrusse.fr>
Date: Mon, 18 Mar 2024 11:48:29 +0100
Subject: [PATCH 1/4] Update translation.json with new plugin list format

---
 ui/public/i18n/en/translation.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ui/public/i18n/en/translation.json b/ui/public/i18n/en/translation.json
index bce568a..4b0df0b 100644
--- a/ui/public/i18n/en/translation.json
+++ b/ui/public/i18n/en/translation.json
@@ -36,7 +36,8 @@
     "upload_max_filesize_invalid_type": "Must be an integer",
     "configuring": "Configuring",
     "instance_configuration": "Configure Roundcube",
-    "placeholder_plugins": "Plugins list (comma separated: plugin1,plugin2,plugin3)",
+    "Write_plugins_list": "Write plugins list (one plugin per line)",
+    "invalid_plugin": "Invalid plugin name : {plugin}",
     "choose_mail_server": "Select a domain",
     "choose_the_mail_server_to_use": "Choose the domain suffix used for both identifying and initializing the user account and their mail address preferences",
     "mail_server_is_not_valid": "This mail server cannot be used by Roundcube webmail",

From 4553f442ae82c5b4c0f6b09b23fdfa9dc3f6d4de Mon Sep 17 00:00:00 2001
From: Stephane de Labrusse <stephdl@de-labrusse.fr>
Date: Mon, 18 Mar 2024 11:48:34 +0100
Subject: [PATCH 2/4] Refactor Settings.vue component to use cv-text-area for
 plugins input

---
 ui/src/views/Settings.vue | 41 +++++++++++++++++++++++++++++++--------
 1 file changed, 33 insertions(+), 8 deletions(-)

diff --git a/ui/src/views/Settings.vue b/ui/src/views/Settings.vue
index 1ed3eeb..f67b650 100644
--- a/ui/src/views/Settings.vue
+++ b/ui/src/views/Settings.vue
@@ -98,18 +98,20 @@
               <cv-accordion-item :open="toggleAccordion[0]">
                 <template slot="title">{{ $t("settings.advanced") }}</template>
                 <template slot="content">
-                  <cv-text-input
+                  <cv-text-area
                     :label="$t('settings.plugins')"
-                    :placeholder="$t('settings.placeholder_plugins')"
                     v-model.trim="plugins"
-                    class="mg-bottom"
-                    :invalid-message="$t(error.plugins)"
+                    :invalid-message="error.plugins"
+                    :helper-text="$t('settings.Write_plugins_list')"
+                    :value="plugins"
+                    class="maxwidth textarea mg-left"
+                    ref="plugins"
+                    :placeholder="$t('settings.Write_plugins_list')"
                     :disabled="
                       loading.getConfiguration || loading.configureModule
                     "
-                    ref="plugins"
                   >
-                  </cv-text-input>
+                  </cv-text-area>
                   <cv-text-input
                     :label="$t('settings.upload_max_filesize')"
                     placeholder="5"
@@ -304,10 +306,15 @@ export default {
       });
 
       this.mail_server_URL = config.mail_server_URL;
-      this.plugins = config.plugins;
+      this.plugins = config.plugins.split(",").join("\n");
       this.loading.getConfiguration = false;
       this.focusElement("host");
     },
+    isValidPlugin(plugin) {
+      // test if user is valid login
+      const re = /^[a-zA-Z0-9-_]+$/;
+      return re.test(plugin);
+    },
     validateConfigureModule() {
       this.clearErrors(this);
 
@@ -328,6 +335,24 @@ export default {
         }
         isValidationOk = false;
       }
+      if (this.plugins) {
+        // test if the plugins list is valid
+        const plugins_list = this.plugins.split("\n");
+        for (const plugin of plugins_list) {
+          if (!this.isValidPlugin(plugin.trim())){
+            this.toggleAccordion[0] = true;
+            // set i18n error message and return plugin in object
+            this.error.plugins = this.$t("settings.invalid_plugin", {
+              plugin: plugin,
+            });
+            isValidationOk = false;
+            if (isValidationOk) {
+              this.focusElement("plugins");
+            }
+            break;
+          }
+        }
+      }
       return isValidationOk;
     },
     configureModuleValidationFailed(validationErrors) {
@@ -386,7 +411,7 @@ export default {
             http2https: this.isHttpToHttpsEnabled,
             mail_server: mail_server_tmp,
             mail_domain: mail_domain_tmp,
-            plugins: this.plugins,
+            plugins: this.plugins.split("\n").join(",").trim().toLowerCase(),
             upload_max_filesize: parseInt(this.upload_max_filesize),
           },
           extra: {

From 3129a2538aa5b24a644d05ec7b3787d6a52ce5d5 Mon Sep 17 00:00:00 2001
From: Stephane de Labrusse <stephdl@de-labrusse.fr>
Date: Wed, 20 Mar 2024 11:34:59 +0100
Subject: [PATCH 3/4] Translation review of Andrea

Co-authored-by: Andrea Leardini <andre8244@gmail.com>
---
 ui/public/i18n/en/translation.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ui/public/i18n/en/translation.json b/ui/public/i18n/en/translation.json
index 4b0df0b..fb29c45 100644
--- a/ui/public/i18n/en/translation.json
+++ b/ui/public/i18n/en/translation.json
@@ -36,8 +36,8 @@
     "upload_max_filesize_invalid_type": "Must be an integer",
     "configuring": "Configuring",
     "instance_configuration": "Configure Roundcube",
-    "Write_plugins_list": "Write plugins list (one plugin per line)",
-    "invalid_plugin": "Invalid plugin name : {plugin}",
+    "plugins_list": "Plugins list (one plugin per line)",
+    "invalid_plugin": "Invalid plugin name: {plugin}",
     "choose_mail_server": "Select a domain",
     "choose_the_mail_server_to_use": "Choose the domain suffix used for both identifying and initializing the user account and their mail address preferences",
     "mail_server_is_not_valid": "This mail server cannot be used by Roundcube webmail",

From cb7aa375593932469bad0ea72eaede5275876eb3 Mon Sep 17 00:00:00 2001
From: Stephane de Labrusse <stephdl@de-labrusse.fr>
Date: Wed, 20 Mar 2024 11:37:14 +0100
Subject: [PATCH 4/4] code review of Andrea Leardini

Co-authored-by: Andrea Leardini <andre8244@gmail.com>
---
 ui/src/views/Settings.vue | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/ui/src/views/Settings.vue b/ui/src/views/Settings.vue
index f67b650..0603a78 100644
--- a/ui/src/views/Settings.vue
+++ b/ui/src/views/Settings.vue
@@ -102,11 +102,11 @@
                     :label="$t('settings.plugins')"
                     v-model.trim="plugins"
                     :invalid-message="error.plugins"
-                    :helper-text="$t('settings.Write_plugins_list')"
+                    :helper-text="$t('settings.plugins_list')"
                     :value="plugins"
                     class="maxwidth textarea mg-left"
                     ref="plugins"
-                    :placeholder="$t('settings.Write_plugins_list')"
+                    :placeholder="$t('settings.plugins_list')"
                     :disabled="
                       loading.getConfiguration || loading.configureModule
                     "
@@ -311,7 +311,6 @@ export default {
       this.focusElement("host");
     },
     isValidPlugin(plugin) {
-      // test if user is valid login
       const re = /^[a-zA-Z0-9-_]+$/;
       return re.test(plugin);
     },