Fix: Remove nl2br() to prevent repeated <br /> tag accumulation in UI footer

Co-authored-by: DerLinkman <62480600+DerLinkman@users.noreply.github.com>

data/Dockerfiles/dovecot/docker-entrypoint.sh

@@ -121,13 +121,7 @@ echo -n 'quota acl zlib mail_crypt mail_crypt_acl mail_log notify fts fts_flatcu
 echo -n 'quota imap_quota imap_acl acl zlib imap_zlib imap_sieve mail_crypt mail_crypt_acl notify mail_log fts fts_flatcurve listescape replication' > /etc/dovecot/mail_plugins_imap
 echo -n 'quota sieve acl zlib mail_crypt mail_crypt_acl fts fts_flatcurve notify listescape replication' > /etc/dovecot/mail_plugins_lmtp
 fi
-
-# Create empty extra plugin files if they don't exist (can be populated via extra.conf or direct file)
-for plugin_file in mail_plugins_extra mail_plugins_imap_extra mail_plugins_lmtp_extra; do
-  [[ ! -f /etc/dovecot/${plugin_file} ]] && touch /etc/dovecot/${plugin_file}
-done
-
-chmod 644 /etc/dovecot/mail_plugins /etc/dovecot/mail_plugins_imap /etc/dovecot/mail_plugins_lmtp /etc/dovecot/mail_plugins_extra /etc/dovecot/mail_plugins_imap_extra /etc/dovecot/mail_plugins_lmtp_extra /templates/quarantine.tpl
+chmod 644 /etc/dovecot/mail_plugins /etc/dovecot/mail_plugins_imap /etc/dovecot/mail_plugins_lmtp /templates/quarantine.tpl
 
 cat <<EOF > /etc/dovecot/sql/dovecot-dict-sql-userdb.conf
 # Autogenerated by mailcow

data/conf/dovecot/dovecot.conf

@@ -1,25 +1,6 @@
 # --------------------------------------------------------------------------
 # Please create a file "extra.conf" for persistent overrides to dovecot.conf
 # --------------------------------------------------------------------------
-# To extend mail_plugins, you have two options:
-#
-# Option 1 (Recommended): Use the extra plugin files directly
-#   Create/edit data/conf/dovecot/mail_plugins_extra (for global plugins)
-#   Create/edit data/conf/dovecot/mail_plugins_imap_extra (for IMAP-specific plugins)
-#   Create/edit data/conf/dovecot/mail_plugins_lmtp_extra (for LMTP-specific plugins)
-#   Note: These paths are on the host. Inside the container they are /etc/dovecot/mail_plugins_*
-#   Example to add the virtual plugin for IMAP:
-#     echo -n ' virtual' > data/conf/dovecot/mail_plugins_imap_extra
-#     docker-compose restart dovecot-mailcow
-#
-# Option 2: Override protocol sections in extra.conf
-#   Create data/conf/dovecot/extra.conf with protocol-specific overrides:
-#     protocol imap {
-#       mail_plugins = $mail_plugins virtual
-#     }
-#   Note: This requires redefining the entire protocol block and may override
-#   other settings. Option 1 is simpler and less prone to conflicts.
-# --------------------------------------------------------------------------
 # LDAP example:
 #passdb {
 #  args = /etc/dovecot/ldap/passdb.conf
@@ -40,7 +21,7 @@ disable_plaintext_auth = yes
 login_log_format_elements = "user=<%u> method=%m rip=%r lip=%l mpid=%e %c %k"
 mail_home = /var/vmail/%d/%n
 mail_location = maildir:~/
-mail_plugins = </etc/dovecot/mail_plugins </etc/dovecot/mail_plugins_extra
+mail_plugins = </etc/dovecot/mail_plugins
 mail_attachment_fs = crypt:set_prefix=mail_crypt_global:posix:
 mail_attachment_dir = /var/attachments
 mail_attachment_min_size = 128k
@@ -199,12 +180,12 @@ userdb {
   skip = found
 }
 protocol imap {
-  mail_plugins = </etc/dovecot/mail_plugins_imap </etc/dovecot/mail_plugins_imap_extra
+  mail_plugins = </etc/dovecot/mail_plugins_imap
   imap_metadata = yes
 }
 mail_attribute_dict = file:%h/dovecot-attributes
 protocol lmtp {
-  mail_plugins = </etc/dovecot/mail_plugins_lmtp </etc/dovecot/mail_plugins_lmtp_extra
+  mail_plugins = </etc/dovecot/mail_plugins_lmtp
   auth_socket_path = /var/run/dovecot/auth-master
 }
 protocol sieve {

data/web/inc/header.inc.php

@@ -62,12 +62,6 @@ if ($app_links_processed){
   }
 }
 
-// Workaround to get text with <br> straight to twig.
-// Using "nl2br" doesn't work with Twig as it would escape everything by default.
-if (isset($UI_TEXTS["ui_footer"])) {
-  $UI_TEXTS["ui_footer"] = nl2br($UI_TEXTS["ui_footer"]);
-}
-
 $globalVariables = [
   'mailcow_hostname' => getenv('MAILCOW_HOSTNAME'),
   'mailcow_locale' => @$_SESSION['mailcow_locale'],