From 15c73e92d602fc2c5a1b47dbd2a381327064e29c Mon Sep 17 00:00:00 2001
From: Herman van Rink <rink@initfour.nl>
Date: Sun, 6 Aug 2023 00:07:36 +0200
Subject: [PATCH 1/3] Show aliases in mail user edit form, #6553

---
 interface/web/mail/lib/lang/en_mail_user.lng            | 1 +
 interface/web/mail/mail_user_edit.php                   | 4 ++++
 interface/web/mail/templates/mail_user_mailbox_edit.htm | 3 ++-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/interface/web/mail/lib/lang/en_mail_user.lng b/interface/web/mail/lib/lang/en_mail_user.lng
index 96975a1a70..e0a79f7295 100644
--- a/interface/web/mail/lib/lang/en_mail_user.lng
+++ b/interface/web/mail/lib/lang/en_mail_user.lng
@@ -76,4 +76,5 @@ $wb['purge_junk_days_txt'] = 'Purge Junk automatically after X days';
 $wb['tooltip_purge_junk_days_txt'] = '0 = disabled';
 $wb['imap_prefix_txt'] = 'IMAP prefix';
 $wb['tooltip_imap_prefix_txt'] = 'In most cases this should be left empty.  To allow seamless per-mailbox migration of legacy systems you can specify a prefix followed by the hierarchy separator. e.g.: \'INBOX.\'';
+$wb['mail_addresses_txt'] = 'Receives also mail for';
 ?>
diff --git a/interface/web/mail/mail_user_edit.php b/interface/web/mail/mail_user_edit.php
index 975133fdc4..a4fe274dad 100644
--- a/interface/web/mail/mail_user_edit.php
+++ b/interface/web/mail/mail_user_edit.php
@@ -143,6 +143,10 @@ class page_action extends tform_actions {
 		$global_config = $app->getconf->get_global_config();
 		$app->tpl->setVar('show_delete_on_forms', $global_config['misc']['show_delete_on_forms']);
 
+		# Get addresses for this account.
+		$addresses = $app->db->queryAllRecords("SELECT source, type FROM mail_forwarding WHERE destination = ? AND ".$app->tform->getAuthSQL('r'), $email);
+		$app->tpl->setLoop("mail_addresses", $addresses);
+
 		parent::onShowEnd();
 	}
 
diff --git a/interface/web/mail/templates/mail_user_mailbox_edit.htm b/interface/web/mail/templates/mail_user_mailbox_edit.htm
index 5dd5e50a90..6abb7583d4 100644
--- a/interface/web/mail/templates/mail_user_mailbox_edit.htm
+++ b/interface/web/mail/templates/mail_user_mailbox_edit.htm
@@ -17,7 +17,8 @@
                           </a>
                         </div>
                     </div>
-				</div>
+                    <tmpl_if name="mail_addresses">{tmpl_var name='mail_addresses_txt'}: <tmpl_loop name="mail_addresses">{tmpl_var name='source'}({tmpl_var name='type'})<tmpl_unless name="__LAST__">, </tmpl_unless></tmpl_loop></tmpl_if>
+                </div>
             </div>
             <tmpl_if name="enable_custom_login"><div class="form-group">
                     <label for="login" class="col-sm-3 control-label">{tmpl_var name='login_txt'}</label>
-- 
GitLab


From 0d933fccf1742cd2f8dd62a1a38d0aef217edfe0 Mon Sep 17 00:00:00 2001
From: Herman van Rink <rink@initfour.nl>
Date: Sun, 6 Aug 2023 00:10:22 +0200
Subject: [PATCH 2/3] Translations

---
 interface/web/mail/lib/lang/ar_mail_user.lng | 1 +
 interface/web/mail/lib/lang/bg_mail_user.lng | 1 +
 interface/web/mail/lib/lang/br_mail_user.lng | 1 +
 interface/web/mail/lib/lang/ca_mail_user.lng | 1 +
 interface/web/mail/lib/lang/cn_mail_user.lng | 1 +
 interface/web/mail/lib/lang/cz_mail_user.lng | 1 +
 interface/web/mail/lib/lang/de_mail_user.lng | 1 +
 interface/web/mail/lib/lang/dk_mail_user.lng | 1 +
 interface/web/mail/lib/lang/el_mail_user.lng | 1 +
 interface/web/mail/lib/lang/es_mail_user.lng | 1 +
 interface/web/mail/lib/lang/fi_mail_user.lng | 1 +
 interface/web/mail/lib/lang/fr_mail_user.lng | 1 +
 interface/web/mail/lib/lang/hr_mail_user.lng | 1 +
 interface/web/mail/lib/lang/hu_mail_user.lng | 1 +
 interface/web/mail/lib/lang/id_mail_user.lng | 1 +
 interface/web/mail/lib/lang/it_mail_user.lng | 1 +
 interface/web/mail/lib/lang/ja_mail_user.lng | 1 +
 interface/web/mail/lib/lang/nl_mail_user.lng | 1 +
 interface/web/mail/lib/lang/pl_mail_user.lng | 1 +
 interface/web/mail/lib/lang/pt_mail_user.lng | 1 +
 interface/web/mail/lib/lang/ro_mail_user.lng | 1 +
 interface/web/mail/lib/lang/ru_mail_user.lng | 1 +
 interface/web/mail/lib/lang/se_mail_user.lng | 1 +
 interface/web/mail/lib/lang/sk_mail_user.lng | 1 +
 interface/web/mail/lib/lang/tr_mail_user.lng | 1 +
 25 files changed, 25 insertions(+)

diff --git a/interface/web/mail/lib/lang/ar_mail_user.lng b/interface/web/mail/lib/lang/ar_mail_user.lng
index a879201cb0..7322ac4d3e 100644
--- a/interface/web/mail/lib/lang/ar_mail_user.lng
+++ b/interface/web/mail/lib/lang/ar_mail_user.lng
@@ -77,4 +77,5 @@ $wb['purge_junk_days_txt'] = 'Purge Junk automatically after X days';
 $wb['tooltip_purge_junk_days_txt'] = '0 = disabled';
 $wb['imap_prefix_txt'] = 'IMAP prefix';
 $wb['tooltip_imap_prefix_txt'] = 'In most cases this should be left empty.  To allow seamless per-mailbox migration of legacy systems you can specify a prefix followed by the hierarchy separator. e.g.: \'INBOX.\'';
+$wb['mail_addresses_txt'] = 'Receives also mail for';
 ?>
diff --git a/interface/web/mail/lib/lang/bg_mail_user.lng b/interface/web/mail/lib/lang/bg_mail_user.lng
index 3084b0d050..65d11cd247 100644
--- a/interface/web/mail/lib/lang/bg_mail_user.lng
+++ b/interface/web/mail/lib/lang/bg_mail_user.lng
@@ -77,4 +77,5 @@ $wb['purge_junk_days_txt'] = 'Purge Junk automatically after X days';
 $wb['tooltip_purge_junk_days_txt'] = '0 = disabled';
 $wb['imap_prefix_txt'] = 'IMAP prefix';
 $wb['tooltip_imap_prefix_txt'] = 'In most cases this should be left empty.  To allow seamless per-mailbox migration of legacy systems you can specify a prefix followed by the hierarchy separator. e.g.: \'INBOX.\'';
+$wb['mail_addresses_txt'] = 'Receives also mail for';
 ?>
diff --git a/interface/web/mail/lib/lang/br_mail_user.lng b/interface/web/mail/lib/lang/br_mail_user.lng
index 578b606cda..c11afd08f0 100644
--- a/interface/web/mail/lib/lang/br_mail_user.lng
+++ b/interface/web/mail/lib/lang/br_mail_user.lng
@@ -74,3 +74,4 @@ $wb['purge_trash_days_txt'] = 'Esvazia lixeira automaticamente após N dias';
 $wb['tooltip_purge_trash_days_txt'] = '0 = desabilitado';
 $wb['purge_junk_days_txt'] = 'Esvazia pasta Junk automaticamente após N dias';
 $wb['tooltip_purge_junk_days_txt'] = '0 = desabilitado';
+$wb['mail_addresses_txt'] = 'Receives also mail for';
diff --git a/interface/web/mail/lib/lang/ca_mail_user.lng b/interface/web/mail/lib/lang/ca_mail_user.lng
index 9489390a7e..f7bdd491fd 100644
--- a/interface/web/mail/lib/lang/ca_mail_user.lng
+++ b/interface/web/mail/lib/lang/ca_mail_user.lng
@@ -76,4 +76,5 @@ $wb['purge_junk_days_txt'] = 'Purge Junk automatically after X days';
 $wb['tooltip_purge_junk_days_txt'] = '0 = disabled';
 $wb['imap_prefix_txt'] = 'IMAP prefix';
 $wb['tooltip_imap_prefix_txt'] = 'In most cases this should be left empty.  To allow seamless per-mailbox migration of legacy systems you can specify a prefix followed by the hierarchy separator. e.g.: \'INBOX.\'';
+$wb['mail_addresses_txt'] = 'Receives also mail for';
 ?>
diff --git a/interface/web/mail/lib/lang/cn_mail_user.lng b/interface/web/mail/lib/lang/cn_mail_user.lng
index 9461e25228..8dbf0c553f 100644
--- a/interface/web/mail/lib/lang/cn_mail_user.lng
+++ b/interface/web/mail/lib/lang/cn_mail_user.lng
@@ -74,4 +74,5 @@ $wb['purge_trash_days_txt'] = '自动在 X 天后清空垃圾箱';
 $wb['tooltip_purge_trash_days_txt'] = '0 = 禁用';
 $wb['purge_junk_days_txt'] = '自动在 X 天后清空垃圾邮件';
 $wb['tooltip_purge_junk_days_txt'] = '0 = 禁用';
+$wb['mail_addresses_txt'] = 'Receives also mail for';
 ?>
diff --git a/interface/web/mail/lib/lang/cz_mail_user.lng b/interface/web/mail/lib/lang/cz_mail_user.lng
index 022e672387..25a4ba2f9a 100644
--- a/interface/web/mail/lib/lang/cz_mail_user.lng
+++ b/interface/web/mail/lib/lang/cz_mail_user.lng
@@ -75,3 +75,4 @@ $wb['tooltip_purge_trash_days_txt'] = '0 = neaktivní';
 $wb['purge_junk_days_txt'] = 'Vyčistit nevyžádanou poštu \"Junk\" automaticky po X dnech.';
 $wb['tooltip_purge_junk_days_txt'] = '0 = neaktivní';
 $wb['disablesmtp_txt'] = 'Zakázat SMTP (pouze odesílání)';
+$wb['mail_addresses_txt'] = 'Receives also mail for';
diff --git a/interface/web/mail/lib/lang/de_mail_user.lng b/interface/web/mail/lib/lang/de_mail_user.lng
index db8c85a2da..a06f5ef95c 100644
--- a/interface/web/mail/lib/lang/de_mail_user.lng
+++ b/interface/web/mail/lib/lang/de_mail_user.lng
@@ -78,3 +78,4 @@ $wb['imap_prefix_txt'] = 'IMAP prefix';
 $wb['tooltip_imap_prefix_txt'] = 'In most cases this should be left empty.  To allow seamless per-mailbox migration of legacy systems you can specify a prefix followed by the hierarchy separator. e.g.: \'INBOX.\'';
 ?>
 
+$wb['mail_addresses_txt'] = 'Receives also mail for';
diff --git a/interface/web/mail/lib/lang/dk_mail_user.lng b/interface/web/mail/lib/lang/dk_mail_user.lng
index d2e7cfd008..136a202746 100644
--- a/interface/web/mail/lib/lang/dk_mail_user.lng
+++ b/interface/web/mail/lib/lang/dk_mail_user.lng
@@ -76,4 +76,5 @@ $wb['purge_junk_days_txt'] = 'Purge Junk automatically after X days';
 $wb['tooltip_purge_junk_days_txt'] = '0 = disabled';
 $wb['imap_prefix_txt'] = 'IMAP prefix';
 $wb['tooltip_imap_prefix_txt'] = 'In most cases this should be left empty.  To allow seamless per-mailbox migration of legacy systems you can specify a prefix followed by the hierarchy separator. e.g.: \'INBOX.\'';
+$wb['mail_addresses_txt'] = 'Receives also mail for';
 ?>
diff --git a/interface/web/mail/lib/lang/el_mail_user.lng b/interface/web/mail/lib/lang/el_mail_user.lng
index 52b42874dd..9b01db0525 100644
--- a/interface/web/mail/lib/lang/el_mail_user.lng
+++ b/interface/web/mail/lib/lang/el_mail_user.lng
@@ -76,4 +76,5 @@ $wb['purge_junk_days_txt'] = 'Purge Junk automatically after X days';
 $wb['tooltip_purge_junk_days_txt'] = '0 = disabled';
 $wb['imap_prefix_txt'] = 'IMAP prefix';
 $wb['tooltip_imap_prefix_txt'] = 'In most cases this should be left empty.  To allow seamless per-mailbox migration of legacy systems you can specify a prefix followed by the hierarchy separator. e.g.: \'INBOX.\'';
+$wb['mail_addresses_txt'] = 'Receives also mail for';
 ?>
diff --git a/interface/web/mail/lib/lang/es_mail_user.lng b/interface/web/mail/lib/lang/es_mail_user.lng
index 43e1c3c550..7f331c50ad 100644
--- a/interface/web/mail/lib/lang/es_mail_user.lng
+++ b/interface/web/mail/lib/lang/es_mail_user.lng
@@ -76,4 +76,5 @@ $wb['purge_junk_days_txt'] = 'Purge Junk automatically after X days';
 $wb['tooltip_purge_junk_days_txt'] = '0 = disabled';
 $wb['imap_prefix_txt'] = 'IMAP prefix';
 $wb['tooltip_imap_prefix_txt'] = 'In most cases this should be left empty.  To allow seamless per-mailbox migration of legacy systems you can specify a prefix followed by the hierarchy separator. e.g.: \'INBOX.\'';
+$wb['mail_addresses_txt'] = 'Receives also mail for';
 ?>
diff --git a/interface/web/mail/lib/lang/fi_mail_user.lng b/interface/web/mail/lib/lang/fi_mail_user.lng
index bbb479d463..941aa37090 100644
--- a/interface/web/mail/lib/lang/fi_mail_user.lng
+++ b/interface/web/mail/lib/lang/fi_mail_user.lng
@@ -77,4 +77,5 @@ $wb['purge_junk_days_txt'] = 'Purge Junk automatically after X days';
 $wb['tooltip_purge_junk_days_txt'] = '0 = disabled';
 $wb['imap_prefix_txt'] = 'IMAP prefix';
 $wb['tooltip_imap_prefix_txt'] = 'In most cases this should be left empty.  To allow seamless per-mailbox migration of legacy systems you can specify a prefix followed by the hierarchy separator. e.g.: \'INBOX.\'';
+$wb['mail_addresses_txt'] = 'Receives also mail for';
 ?>
diff --git a/interface/web/mail/lib/lang/fr_mail_user.lng b/interface/web/mail/lib/lang/fr_mail_user.lng
index 74abb9de7f..9b19cab534 100644
--- a/interface/web/mail/lib/lang/fr_mail_user.lng
+++ b/interface/web/mail/lib/lang/fr_mail_user.lng
@@ -76,4 +76,5 @@ $wb['purge_junk_days_txt'] = 'Purge Junk automatically after X days';
 $wb['tooltip_purge_junk_days_txt'] = '0 = disabled';
 $wb['imap_prefix_txt'] = 'IMAP prefix';
 $wb['tooltip_imap_prefix_txt'] = 'In most cases this should be left empty.  To allow seamless per-mailbox migration of legacy systems you can specify a prefix followed by the hierarchy separator. e.g.: \'INBOX.\'';
+$wb['mail_addresses_txt'] = 'Receives also mail for';
 ?>
diff --git a/interface/web/mail/lib/lang/hr_mail_user.lng b/interface/web/mail/lib/lang/hr_mail_user.lng
index 0fa0370ceb..846a282f33 100644
--- a/interface/web/mail/lib/lang/hr_mail_user.lng
+++ b/interface/web/mail/lib/lang/hr_mail_user.lng
@@ -77,4 +77,5 @@ $wb['purge_junk_days_txt'] = 'Purge Junk automatically after X days';
 $wb['tooltip_purge_junk_days_txt'] = '0 = disabled';
 $wb['imap_prefix_txt'] = 'IMAP prefix';
 $wb['tooltip_imap_prefix_txt'] = 'In most cases this should be left empty.  To allow seamless per-mailbox migration of legacy systems you can specify a prefix followed by the hierarchy separator. e.g.: \'INBOX.\'';
+$wb['mail_addresses_txt'] = 'Receives also mail for';
 ?>
diff --git a/interface/web/mail/lib/lang/hu_mail_user.lng b/interface/web/mail/lib/lang/hu_mail_user.lng
index 1661f5b669..3347adefa5 100644
--- a/interface/web/mail/lib/lang/hu_mail_user.lng
+++ b/interface/web/mail/lib/lang/hu_mail_user.lng
@@ -77,4 +77,5 @@ $wb['purge_junk_days_txt'] = 'Purge Junk automatically after X days';
 $wb['tooltip_purge_junk_days_txt'] = '0 = disabled';
 $wb['imap_prefix_txt'] = 'IMAP prefix';
 $wb['tooltip_imap_prefix_txt'] = 'In most cases this should be left empty.  To allow seamless per-mailbox migration of legacy systems you can specify a prefix followed by the hierarchy separator. e.g.: \'INBOX.\'';
+$wb['mail_addresses_txt'] = 'Receives also mail for';
 ?>
diff --git a/interface/web/mail/lib/lang/id_mail_user.lng b/interface/web/mail/lib/lang/id_mail_user.lng
index fa5b74e8ea..a90350368e 100644
--- a/interface/web/mail/lib/lang/id_mail_user.lng
+++ b/interface/web/mail/lib/lang/id_mail_user.lng
@@ -77,4 +77,5 @@ $wb['purge_junk_days_txt'] = 'Purge Junk automatically after X days';
 $wb['tooltip_purge_junk_days_txt'] = '0 = disabled';
 $wb['imap_prefix_txt'] = 'IMAP prefix';
 $wb['tooltip_imap_prefix_txt'] = 'In most cases this should be left empty.  To allow seamless per-mailbox migration of legacy systems you can specify a prefix followed by the hierarchy separator. e.g.: \'INBOX.\'';
+$wb['mail_addresses_txt'] = 'Receives also mail for';
 ?>
diff --git a/interface/web/mail/lib/lang/it_mail_user.lng b/interface/web/mail/lib/lang/it_mail_user.lng
index dba7214e90..5f4071d55e 100644
--- a/interface/web/mail/lib/lang/it_mail_user.lng
+++ b/interface/web/mail/lib/lang/it_mail_user.lng
@@ -77,4 +77,5 @@ $wb['purge_junk_days_txt'] = 'Svuota cartella Indesiderati automaticamente dopo
 $wb['tooltip_purge_junk_days_txt'] = '0 = Disabilitato';
 $wb['imap_prefix_txt'] = 'IMAP prefix';
 $wb['tooltip_imap_prefix_txt'] = 'In most cases this should be left empty.  To allow seamless per-mailbox migration of legacy systems you can specify a prefix followed by the hierarchy separator. e.g.: \'INBOX.\'';
+$wb['mail_addresses_txt'] = 'Receives also mail for';
 ?>
diff --git a/interface/web/mail/lib/lang/ja_mail_user.lng b/interface/web/mail/lib/lang/ja_mail_user.lng
index fc094c352a..ba2bf63b81 100644
--- a/interface/web/mail/lib/lang/ja_mail_user.lng
+++ b/interface/web/mail/lib/lang/ja_mail_user.lng
@@ -77,4 +77,5 @@ $wb['purge_junk_days_txt'] = 'Purge Junk automatically after X days';
 $wb['tooltip_purge_junk_days_txt'] = '0 = disabled';
 $wb['imap_prefix_txt'] = 'IMAP prefix';
 $wb['tooltip_imap_prefix_txt'] = 'In most cases this should be left empty.  To allow seamless per-mailbox migration of legacy systems you can specify a prefix followed by the hierarchy separator. e.g.: \'INBOX.\'';
+$wb['mail_addresses_txt'] = 'Receives also mail for';
 ?>
diff --git a/interface/web/mail/lib/lang/nl_mail_user.lng b/interface/web/mail/lib/lang/nl_mail_user.lng
index bf57cd61a9..0f09255f55 100644
--- a/interface/web/mail/lib/lang/nl_mail_user.lng
+++ b/interface/web/mail/lib/lang/nl_mail_user.lng
@@ -76,4 +76,5 @@ $wb['purge_junk_days_txt'] = 'Purge Junk automatically after X days';
 $wb['tooltip_purge_junk_days_txt'] = '0 = disabled';
 $wb['imap_prefix_txt'] = 'IMAP prefix';
 $wb['tooltip_imap_prefix_txt'] = 'In most cases this should be left empty.  To allow seamless per-mailbox migration of legacy systems you can specify a prefix followed by the hierarchy separator. e.g.: \'INBOX.\'';
+$wb['mail_addresses_txt'] = 'Receives also mail for';
 ?>
diff --git a/interface/web/mail/lib/lang/pl_mail_user.lng b/interface/web/mail/lib/lang/pl_mail_user.lng
index 7ed80ace95..5803cfffd8 100644
--- a/interface/web/mail/lib/lang/pl_mail_user.lng
+++ b/interface/web/mail/lib/lang/pl_mail_user.lng
@@ -77,4 +77,5 @@ $wb['purge_junk_days_txt'] = 'Purge Junk automatically after X days';
 $wb['tooltip_purge_junk_days_txt'] = '0 = disabled';
 $wb['imap_prefix_txt'] = 'IMAP prefix';
 $wb['tooltip_imap_prefix_txt'] = 'In most cases this should be left empty.  To allow seamless per-mailbox migration of legacy systems you can specify a prefix followed by the hierarchy separator. e.g.: \'INBOX.\'';
+$wb['mail_addresses_txt'] = 'Receives also mail for';
 ?>
diff --git a/interface/web/mail/lib/lang/pt_mail_user.lng b/interface/web/mail/lib/lang/pt_mail_user.lng
index 3bc325a52e..caea11c2c2 100644
--- a/interface/web/mail/lib/lang/pt_mail_user.lng
+++ b/interface/web/mail/lib/lang/pt_mail_user.lng
@@ -77,4 +77,5 @@ $wb['purge_junk_days_txt'] = 'Purge Junk automatically after X days';
 $wb['tooltip_purge_junk_days_txt'] = '0 = disabled';
 $wb['imap_prefix_txt'] = 'IMAP prefix';
 $wb['tooltip_imap_prefix_txt'] = 'In most cases this should be left empty.  To allow seamless per-mailbox migration of legacy systems you can specify a prefix followed by the hierarchy separator. e.g.: \'INBOX.\'';
+$wb['mail_addresses_txt'] = 'Receives also mail for';
 ?>
diff --git a/interface/web/mail/lib/lang/ro_mail_user.lng b/interface/web/mail/lib/lang/ro_mail_user.lng
index a7f2c4164d..d80cf78cc0 100644
--- a/interface/web/mail/lib/lang/ro_mail_user.lng
+++ b/interface/web/mail/lib/lang/ro_mail_user.lng
@@ -77,4 +77,5 @@ $wb['purge_junk_days_txt'] = 'Purge Junk automatically after X days';
 $wb['tooltip_purge_junk_days_txt'] = '0 = disabled';
 $wb['imap_prefix_txt'] = 'IMAP prefix';
 $wb['tooltip_imap_prefix_txt'] = 'In most cases this should be left empty.  To allow seamless per-mailbox migration of legacy systems you can specify a prefix followed by the hierarchy separator. e.g.: \'INBOX.\'';
+$wb['mail_addresses_txt'] = 'Receives also mail for';
 ?>
diff --git a/interface/web/mail/lib/lang/ru_mail_user.lng b/interface/web/mail/lib/lang/ru_mail_user.lng
index f0ab8c0bba..58fd39b2e4 100644
--- a/interface/web/mail/lib/lang/ru_mail_user.lng
+++ b/interface/web/mail/lib/lang/ru_mail_user.lng
@@ -77,4 +77,5 @@ $wb['purge_junk_days_txt'] = 'Purge Junk automatically after X days';
 $wb['tooltip_purge_junk_days_txt'] = '0 = disabled';
 $wb['imap_prefix_txt'] = 'IMAP prefix';
 $wb['tooltip_imap_prefix_txt'] = 'In most cases this should be left empty.  To allow seamless per-mailbox migration of legacy systems you can specify a prefix followed by the hierarchy separator. e.g.: \'INBOX.\'';
+$wb['mail_addresses_txt'] = 'Receives also mail for';
 ?>
diff --git a/interface/web/mail/lib/lang/se_mail_user.lng b/interface/web/mail/lib/lang/se_mail_user.lng
index 40c91caaa8..7fdbfca67c 100644
--- a/interface/web/mail/lib/lang/se_mail_user.lng
+++ b/interface/web/mail/lib/lang/se_mail_user.lng
@@ -77,4 +77,5 @@ $wb['purge_junk_days_txt'] = 'Purge Junk automatically after X days';
 $wb['tooltip_purge_junk_days_txt'] = '0 = disabled';
 $wb['imap_prefix_txt'] = 'IMAP prefix';
 $wb['tooltip_imap_prefix_txt'] = 'In most cases this should be left empty.  To allow seamless per-mailbox migration of legacy systems you can specify a prefix followed by the hierarchy separator. e.g.: \'INBOX.\'';
+$wb['mail_addresses_txt'] = 'Receives also mail for';
 ?>
diff --git a/interface/web/mail/lib/lang/sk_mail_user.lng b/interface/web/mail/lib/lang/sk_mail_user.lng
index 6af4528543..d997a32d27 100644
--- a/interface/web/mail/lib/lang/sk_mail_user.lng
+++ b/interface/web/mail/lib/lang/sk_mail_user.lng
@@ -77,4 +77,5 @@ $wb['purge_junk_days_txt'] = 'Purge Junk automatically after X days';
 $wb['tooltip_purge_junk_days_txt'] = '0 = disabled';
 $wb['imap_prefix_txt'] = 'IMAP prefix';
 $wb['tooltip_imap_prefix_txt'] = 'In most cases this should be left empty.  To allow seamless per-mailbox migration of legacy systems you can specify a prefix followed by the hierarchy separator. e.g.: \'INBOX.\'';
+$wb['mail_addresses_txt'] = 'Receives also mail for';
 ?>
diff --git a/interface/web/mail/lib/lang/tr_mail_user.lng b/interface/web/mail/lib/lang/tr_mail_user.lng
index c3dfbf1ecf..751f02a164 100644
--- a/interface/web/mail/lib/lang/tr_mail_user.lng
+++ b/interface/web/mail/lib/lang/tr_mail_user.lng
@@ -76,4 +76,5 @@ $wb['purge_junk_days_txt'] = 'Purge Junk automatically after X days';
 $wb['tooltip_purge_junk_days_txt'] = '0 = disabled';
 $wb['imap_prefix_txt'] = 'IMAP prefix';
 $wb['tooltip_imap_prefix_txt'] = 'In most cases this should be left empty.  To allow seamless per-mailbox migration of legacy systems you can specify a prefix followed by the hierarchy separator. e.g.: \'INBOX.\'';
+$wb['mail_addresses_txt'] = 'Receives also mail for';
 ?>
-- 
GitLab


From e24a5449ecdd0c6be71e72fc0e29dae6524c6f87 Mon Sep 17 00:00:00 2001
From: Herman van Rink <rink@initfour.nl>
Date: Wed, 9 Aug 2023 00:42:24 +0200
Subject: [PATCH 3/3] Only in edit mode

---
 interface/web/mail/mail_user_edit.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/interface/web/mail/mail_user_edit.php b/interface/web/mail/mail_user_edit.php
index a4fe274dad..341ec3e321 100644
--- a/interface/web/mail/mail_user_edit.php
+++ b/interface/web/mail/mail_user_edit.php
@@ -143,9 +143,11 @@ class page_action extends tform_actions {
 		$global_config = $app->getconf->get_global_config();
 		$app->tpl->setVar('show_delete_on_forms', $global_config['misc']['show_delete_on_forms']);
 
-		# Get addresses for this account.
-		$addresses = $app->db->queryAllRecords("SELECT source, type FROM mail_forwarding WHERE destination = ? AND ".$app->tform->getAuthSQL('r'), $email);
-		$app->tpl->setLoop("mail_addresses", $addresses);
+		if($this->id > 0) {
+			# Get addresses for this account.
+			$addresses = $app->db->queryAllRecords("SELECT source, type FROM mail_forwarding WHERE destination = ? AND ".$app->tform->getAuthSQL('r'), $email);
+			$app->tpl->setLoop("mail_addresses", $addresses);
+		}
 
 		parent::onShowEnd();
 	}
-- 
GitLab