Skip to content

Commit 760b3d1

Browse files
ScIT-RaphaelScIT-Raphael
authored
Merge pull request hestiacp#1570 from hestiacp/feature/230-dkim_info
Adds DKIM + Other mail server settings in mail over view when hosting…
2 parents cd96eed + 5bcc2f5 commit 760b3d1

File tree

3 files changed

+112
-3
lines changed

3 files changed

+112
-3
lines changed

‎web/list/mail/index.php‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?php
2-
error_reporting(NULL);
2+
#error_reporting(NULL);
33
$TAB = 'MAIL';
44

55
// Main include
@@ -13,6 +13,21 @@
1313
unset($output);
1414

1515
render_page($user, $TAB, 'list_mail');
16+
} else if (!empty($_GET['dns'])) {
17+
exec (HESTIA_CMD."v-list-mail-domain ".escapeshellarg($user)." ".escapeshellarg($_GET['domain'])." json", $output, $return_var);
18+
$data = json_decode(implode('', $output), true);
19+
$data = array_reverse($data, true);
20+
unset($output);
21+
exec (HESTIA_CMD."v-list-user-ips ".escapeshellarg($user)." json", $output, $return_var);
22+
$ips = json_decode(implode('', $output), true);
23+
$ips = array_reverse($ips, true);
24+
unset($output);
25+
exec (HESTIA_CMD."v-list-mail-domain-dkim-dns ".escapeshellarg($user)." ".escapeshellarg($_GET['domain'])." json", $output, $return_var);
26+
$dkim = json_decode(implode('', $output), true);
27+
$dkim = array_reverse($dkim, true);
28+
unset($output);
29+
30+
render_page($user, $TAB, 'list_mail_dns');
1631
} else {
1732
exec (HESTIA_CMD."v-list-mail-accounts ".escapeshellarg($user)." ".escapeshellarg($_GET['domain'])." json", $output, $return_var);
1833
$data = json_decode(implode('', $output), true);

‎web/templates/admin/list_mail.html‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
<input id="toggle-all" type="checkbox" name="toggle-all" value="toggle-all" onChange="checkedAll('objects');">
5353
</div>
5454
<div class="clearfix l-unit__stat-col--left wide-3"><b><?php print _('Domain');?></b></div>
55-
<div class="clearfix l-unit__stat-col--left text-right compact-4"><b>&nbsp;</b></div>
55+
<div class="clearfix l-unit__stat-col--left text-right compact-5"><b>&nbsp;</b></div>
5656
<div class="clearfix l-unit__stat-col--left text-center compact-2"><b><?php print _('Accounts');?></b></div>
5757
<div class="clearfix l-unit__stat-col--left text-center compact-2"><b><?php print _('Disk');?></b></div>
5858
<div class="clearfix l-unit__stat-col--left text-center compact-3"><b><?php print _('Antivirus');?></b></div>
@@ -96,11 +96,12 @@
9696
</div>
9797
<div class="clearfix l-unit__stat-col--left wide-3 truncate"><b><a href="?domain=<?=$key?>&token=<?=$_SESSION['token']?>" title="<?=_('mail accounts')?>: <?=$key?>"><?=$key?></a></b></div>
9898
<!-- START QUICK ACTION TOOLBAR AREA -->
99-
<div class="clearfix l-unit__stat-col--left text-right compact-4">
99+
<div class="clearfix l-unit__stat-col--left text-right compact-5">
100100
<div class="l-unit-toolbar__col l-unit-toolbar__col--right noselect">
101101
<div class="actions-panel clearfix">
102102
<div class="actions-panel__col actions-panel__logs shortcut-n" key-action="href"><a href="/add/mail/?domain=<?=$key?>&token=<?=$_SESSION['token']?>" title="<?=_('Add Mail Account')?>"><i class="fas fa-plus-circle status-icon green status-icon dim"></i></a></div>
103103
<div class="actions-panel__col actions-panel__edit shortcut-l" key-action="href"><a href="?domain=<?=$key?>&token=<?=$_SESSION['token']?>" title="<?=_('mail accounts')?>"><i class="fas fa-users status-icon blue status-icon dim"></i></a></div>
104+
<div class="actions-panel__col actions-panel__edit shortcut-l" key-action="href"><a href="?domain=<?=$key?>&dns=1&token=<?=$_SESSION['token']?>" title="<?=_('DNS records mail')?>"><i class="fas fa-atlas status-icon blue status-icon dim"></i></a></div>
104105
<div class="actions-panel__col actions-panel__edit" key-action="href"><a href="http://<?=$webmail;?>.<?=$key?>/" target="_blank" title="<?=_('open webmail')?>"><i class="fas fa-paper-plane status-icon lightblue status-icon dim"></i></a></div>
105106
<div class="actions-panel__col actions-panel__logs shortcut-enter" key-action="href"><a href="/edit/mail/?domain=<?=$key?>&token=<?=$_SESSION['token']?>" title="<?=_('Editing Mail Domain')?>"><i class="fas fa-pencil-alt status-icon orange status-icon dim"></i></a></div>
106107

‎web/templates/admin/list_mail_dns.html‎

Lines changed: 93 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,93 @@
1+
<?php
2+
$v_webmail_alias = "webmail";
3+
if (!empty($_SESSION['WEBMAIL_ALIAS'])) $v_webmail_alias = $_SESSION['WEBMAIL_ALIAS'];
4+
?>
5+
<div class="l-center">
6+
<div class="l-sort clearfix noselect">
7+
<div class="l-unit-toolbar__buttonstrip">
8+
<a class="ui-button cancel" id="btn-back" href="/list/mail/"><i class="fas fa-arrow-left status-icon blue"></i> <?=_('Back')?></a>
9+
</div>
10+
<div class="l-sort-toolbar clearfix">
11+
<table>
12+
<tr>
13+
<td class="sort-by">
14+
15+
</td>
16+
<td class="l-sort-toolbar__search-box">
17+
18+
</td>
19+
<td>
20+
21+
</td>
22+
</tr>
23+
</table>
24+
</div>
25+
</div>
26+
</div>
27+
28+
<div class="l-separator"></div>
29+
30+
<div class="l-center units animated fadeIn">
31+
<div class="header table-header">
32+
<div class="l-unit__col l-unit__col--right">
33+
<div>
34+
<div class="clearfix l-unit__stat-col--left wide-3"><b><?php print _('Record');?></b></div>
35+
<div class="clearfix l-unit__stat-col--left text-center"><b><?php print _('Type');?></b></div>
36+
<div class="clearfix l-unit__stat-col--left text-center"><b><?php print _('Priority');?></b></div>
37+
<div class="clearfix l-unit__stat-col--left text-center"><b><?php print _('TTL');?></b></div>
38+
<div class="clearfix l-unit__stat-col--left wide-3"><b><?php print _('IP or Value');?></b></div>
39+
</div>
40+
</div>
41+
</div>
42+
<div class="l-unit">
43+
<div class="l-unit__col l-unit__col--right">
44+
<div class="clearfix l-unit__stat-col--left wide-3"><b><input type="text" class="vst-input" style="width:200px !important;" value="mail.<?=htmlspecialchars($_GET['domain']);?>"/></b> </div>
45+
<div class="clearfix l-unit__stat-col--left text-center"><b>A</b></div>
46+
<div class="clearfix l-unit__stat-col--left text-center"><b>10</b></div>
47+
<div class="clearfix l-unit__stat-col--left text-center"><b>14400</b></div>
48+
<div class="clearfix l-unit__stat-col--left wide-3"><b><input type="text" class="vst-input" value="<?php echo array_key_first($ips);?>"/></b></div>
49+
</div>
50+
</div>
51+
<div class="l-unit">
52+
<div class="l-unit__col l-unit__col--right">
53+
<div class="clearfix l-unit__stat-col--left wide-3"><b><input type="text" class="vst-input" style="width:200px !important;" value="<?=$v_webmail_alias;?>.<?=htmlspecialchars($_GET['domain']);?>"/></b> </div>
54+
<div class="clearfix l-unit__stat-col--left text-center"><b>A</b></div>
55+
<div class="clearfix l-unit__stat-col--left text-center"><b>&nbsp;</b></div>
56+
<div class="clearfix l-unit__stat-col--left text-center"><b>14400</b></div>
57+
<div class="clearfix l-unit__stat-col--left wide-3"><b><input type="text" class="vst-input" value="<?php echo array_key_first($ips);?>"/></b></div>
58+
</div>
59+
</div>
60+
<div class="l-unit">
61+
<div class="l-unit__col l-unit__col--right">
62+
<div class="clearfix l-unit__stat-col--left wide-3"><b><input type="text" class="vst-input" style="width:200px !important;" value="@"/></b> </div>
63+
<div class="clearfix l-unit__stat-col--left text-center"><b>TXT</b></div>
64+
<div class="clearfix l-unit__stat-col--left text-center"><b>&nbsp;</b></div>
65+
<div class="clearfix l-unit__stat-col--left text-center"><b>14400</b></div>
66+
<div class="clearfix l-unit__stat-col--left wide-3 "><b><input type="text" class="vst-input" value="<?php echo htmlspecialchars('"v=spf1 a mx ip4:'.array_key_first($ips).'; -all"');?>"/></b></div>
67+
</div>
68+
</div>
69+
<?php foreach($dkim as $key => $value){ ?>
70+
<div class="l-unit">
71+
<div class="l-unit__col l-unit__col--right">
72+
<div class="clearfix l-unit__stat-col--left wide-3"><b><input type="text" class="vst-input" style="width:200px !important;" value="<?=htmlspecialchars($key);?>"/></b></div>
73+
<div class="clearfix l-unit__stat-col--left text-center"><b>TXT</b></div>
74+
<div class="clearfix l-unit__stat-col--left text-center"><b>&nbsp;</b></div>
75+
<div class="clearfix l-unit__stat-col--left text-center"><b>3600</b></div>
76+
<div class="clearfix l-unit__stat-col--left wide-3 "><b><input type="text" class="vst-input" value="<?=htmlspecialchars(str_replace("'",'"',$dkim[$key]['TXT']));?>"</b></div>
77+
</div>
78+
</div>
79+
<?php } ?>
80+
</div>
81+
<div id="vstobjects">
82+
<div class="l-separator"></div>
83+
<div class="l-center">
84+
<div class="l-unit-ft">
85+
<table class='data'></table>
86+
<div class="data-count l-unit__col l-unit__col--right clearfix">
87+
88+
</div>
89+
<div class="data-count l-unit__col l-unit__col--right back clearfix">
90+
</div>
91+
</div>
92+
</div>
93+
</div>

0 commit comments

Comments
 (0)