Skip to content

Commit b60b904

Browse files
author
Kristan Kenney
committed
Fix: Webmail quick action button
* Change domain to mail which is always able to direct to webmail client * Enforce correct redirection if SSL is disabled/enabled for mail
1 parent 6852b62 commit b60b904

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

web/templates/admin/list_mail_acc.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@
9393
<div class="clearfix l-unit__stat-col--left text-right compact-4">
9494
<div class="l-unit-toolbar__col l-unit-toolbar__col--right noselect">
9595
<div class="actions-panel clearfix">
96-
<div class="actions-panel__col actions-panel__edit" key-action="href"><a href="http://webmail.<?=htmlspecialchars($_GET['domain'])?>/?_user=<?=$key?>@<?=htmlspecialchars($_GET['domain'])?>" target="_blank" title="<?=__('open webmail')?>"><i class="fas fa-envelope-open-text status-icon maroon status-icon dim"></i></a></div>
96+
<div class="actions-panel__col actions-panel__edit" key-action="href"><a href="http://mail.<?=htmlspecialchars($_GET['domain'])?>/?_user=<?=$key?>@<?=htmlspecialchars($_GET['domain'])?>" target="_blank" title="<?=__('open webmail')?>"><i class="fas fa-envelope-open-text status-icon maroon status-icon dim"></i></a></div>
9797
<div class="actions-panel__col actions-panel__logs shortcut-enter" key-action="href"><a href="/edit/mail/?domain=<?=htmlspecialchars($_GET['domain'])?>&account=<?=$key?>&token=<?=$_SESSION['token']?>" title="<?=__('Editing Mail Account')?>"><i class="fas fa-pencil-alt status-icon orange status-icon dim"></i></a></div>
9898

9999
<div class="actions-panel__col actions-panel__suspend shortcut-s" key-action="js">

web/templates/user/list_mail_acc.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@
9393
<div class="clearfix l-unit__stat-col--left text-right compact-4">
9494
<div class="l-unit-toolbar__col l-unit-toolbar__col--right noselect">
9595
<div class="actions-panel clearfix">
96-
<div class="actions-panel__col actions-panel__edit" key-action="href"><a href="http://webmail.<?=htmlspecialchars($_GET['domain'])?>/?_user=<?=$key?>@<?=htmlspecialchars($_GET['domain'])?>" target="_blank" title="<?=__('open webmail')?>"><i class="fas fa-envelope-open-text status-icon maroon status-icon dim"></i></a></div>
96+
<div class="actions-panel__col actions-panel__edit" key-action="href"><a href="http://mail.<?=htmlspecialchars($_GET['domain'])?>/?_user=<?=$key?>@<?=htmlspecialchars($_GET['domain'])?>" target="_blank" title="<?=__('open webmail')?>"><i class="fas fa-envelope-open-text status-icon maroon status-icon dim"></i></a></div>
9797
<div class="actions-panel__col actions-panel__logs shortcut-enter" key-action="href"><a href="/edit/mail/?domain=<?=htmlspecialchars($_GET['domain'])?>&account=<?=$key?>&token=<?=$_SESSION['token']?>" title="<?=__('Editing Mail Account')?>"><i class="fas fa-pencil-alt status-icon orange status-icon dim"></i></a></div>
9898

9999
<div class="actions-panel__col actions-panel__suspend shortcut-s" key-action="js">

0 commit comments

Comments
 (0)