Skip to content

Commit 15c73e9

Browse files
committed
Show aliases in mail user edit form, #6553
1 parent dab6683 commit 15c73e9

File tree

3 files changed

+7
-1
lines changed

3 files changed

+7
-1
lines changed

interface/web/mail/lib/lang/en_mail_user.lng

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,4 +76,5 @@ $wb['purge_junk_days_txt'] = 'Purge Junk automatically after X days';
7676
$wb['tooltip_purge_junk_days_txt'] = '0 = disabled';
7777
$wb['imap_prefix_txt'] = 'IMAP prefix';
7878
$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.\'';
79+
$wb['mail_addresses_txt'] = 'Receives also mail for';
7980
?>

interface/web/mail/mail_user_edit.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,10 @@ function onShowEnd() {
143143
$global_config = $app->getconf->get_global_config();
144144
$app->tpl->setVar('show_delete_on_forms', $global_config['misc']['show_delete_on_forms']);
145145

146+
# Get addresses for this account.
147+
$addresses = $app->db->queryAllRecords("SELECT source, type FROM mail_forwarding WHERE destination = ? AND ".$app->tform->getAuthSQL('r'), $email);
148+
$app->tpl->setLoop("mail_addresses", $addresses);
149+
146150
parent::onShowEnd();
147151
}
148152

interface/web/mail/templates/mail_user_mailbox_edit.htm

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@
1717
</a>
1818
</div>
1919
</div>
20-
</div>
20+
<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>
21+
</div>
2122
</div>
2223
<tmpl_if name="enable_custom_login"><div class="form-group">
2324
<label for="login" class="col-sm-3 control-label">{tmpl_var name='login_txt'}</label>

0 commit comments

Comments
 (0)