Merge branch '6553-email_show_aliases' into 'develop'

Till Brehm · Till Brehm · commit d155a8c76e9f · 2024-06-07T13:16:21.000Z
Show aliases in mail user edit form, #6553

Closes #6553

See merge request ispconfig/ispconfig3!1785
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -78,3 +78,4 @@ $wb['imap_prefix_txt'] = 'IMAP-Präfix';
 $wb['tooltip_imap_prefix_txt'] = 'In den meisten Fällen sollte dies leer gelassen werden. Um eine nahtlose Migration von Altsystemen zu ermöglichen, können Sie ein Präfix, gefolgt vom Hierarchietrennzeichen, angeben, z. B: \'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
@@ -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
@@ -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/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/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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -143,6 +143,12 @@ function onShowEnd() {
 		$global_config = $app->getconf->get_global_config();
 		$app->tpl->setVar('show_delete_on_forms', $global_config['misc']['show_delete_on_forms']);
 
+		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();
 	}
 
diff --git 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>

Original file line number	Diff line number	Diff line change
`@@ -78,3 +78,4 @@ $wb['imap_prefix_txt'] = 'IMAP-Präfix';`
`78`	`78`	`$wb['tooltip_imap_prefix_txt'] = 'In den meisten Fällen sollte dies leer gelassen werden. Um eine nahtlose Migration von Altsystemen zu ermöglichen, können Sie ein Präfix, gefolgt vom Hierarchietrennzeichen, angeben, z. B: \'INBOX.\'';`
`79`	`79`	`?>`
`80`	`80`
	`81`	`+$wb['mail_addresses_txt'] = 'Receives also mail for';`