Skip to content

Commit 696ea12

Browse files
author
Kristan Kenney
committed
Retrieve webmail alias when listing mail domains
1 parent 543ab29 commit 696ea12

6 files changed

Lines changed: 19 additions & 24 deletions

File tree

‎bin/v-list-mail-account‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ format=${4-shell}
1717

1818
# Includes
1919
source $HESTIA/func/main.sh
20+
source $HESTIA/conf/hestia.conf
2021

2122
# JSON list function
2223
json_list() {
@@ -30,7 +31,8 @@ json_list() {
3031
"U_DISK": "'$U_DISK'",
3132
"SUSPENDED": "'$SUSPENDED'",
3233
"TIME": "'$TIME'",
33-
"DATE": "'$DATE'"
34+
"DATE": "'$DATE'",
35+
"WEBMAIL_ALIAS": "'$WEBMAIL_ALIAS.$domain'"
3436
}'
3537
echo '}'
3638
}
@@ -47,20 +49,21 @@ shell_list() {
4749
echo "SUSPENDED: $SUSPENDED"
4850
echo "TIME: $TIME"
4951
echo "DATE: $DATE"
52+
echo "WEBMAIL_ALIAS: $WEBMAIL_ALIAS.$domain"
5053
}
5154

5255
# PLAIN list function
5356
plain_list() {
5457
echo -ne "$account\t$ALIAS\t$FWD\t$FWD_ONLY\t$AUTOREPLY\t$QUOTA\t"
55-
echo -e "$U_DISK\t$SUSPENDED\t$TIME\t$DATE"
58+
echo -e "$U_DISK\t$SUSPENDED\t$TIME\t$DATE\t$WEBMAIL_ALIAS.$domain"
5659
}
5760

5861
# CSV list function
5962
csv_list() {
6063
echo -n "ACCOUNT,ALIAS,FWD,FWD_ONLY,AUTOREPLY,QUOTA,U_DISK"
6164
echo "SUSPENDED,TIME,DATE"
6265
echo -n "$ACCOUNT,\"$ALIAS\",\"$FWD\",$FWD_ONLY,$AUTOREPLY,$QUOTA,"
63-
echo "$U_DISK,$SUSPENDED,$TIME,$DATE"
66+
echo "$U_DISK,$SUSPENDED,$TIME,$DATE\t$WEBMAIL_ALIAS.$domain"
6467
}
6568

6669

‎bin/v-list-mail-domain‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ format=${3-shell}
1616

1717
# Includes
1818
source $HESTIA/func/main.sh
19+
source $HESTIA/conf/hestia.conf
1920

2021
# JSON list function
2122
json_list() {
@@ -32,8 +33,8 @@ json_list() {
3233
"LETSENCRYPT": "'$LETSENCRYPT'",
3334
"SUSPENDED": "'$SUSPENDED'",
3435
"TIME": "'$TIME'",
35-
"DATE": "'$DATE'"
36-
}'
36+
"DATE": "'$DATE'",
37+
"WEBMAIL_ALIAS": "'$WEBMAIL_ALIAS.$domain'"'
3738
echo '}'
3839
}
3940

@@ -51,20 +52,21 @@ shell_list() {
5152
echo "SUSPENDED: $SUSPENDED"
5253
echo "TIME: $TIME"
5354
echo "DATE: $DATE"
55+
echo "WEBMAIL_ALIAS: $WEBMAIL_ALIAS.$domain"
5456
}
5557

5658
# PLAIN list function
5759
plain_list() {
5860
echo -ne "$DOMAIN\t$ANTIVIRUS\t$ANTISPAM\t$DKIM\t$CATCHALL\t"
59-
echo -e "$ACCOUNTS\t$U_DISK\t$SSL\t$LETSENCRYPT\t$SUSPENDED\t$TIME\t$DATE"
61+
echo -e "$ACCOUNTS\t$U_DISK\t$SSL\t$LETSENCRYPT\t$SUSPENDED\t$TIME\t$DATE\t$WEBMAIL_ALIAS.$domain"
6062
}
6163

6264
# CSV list function
6365
csv_list() {
6466
echo -n "DOMAIN,ANTIVIRUS,ANTISPAM,DKIM,CATCHALL,ACCOUNTS,U_DISK,"
6567
echo "SSL,LETSENCRYPT,SUSPENDED,TIME,DATE"
6668
echo -n "$DOMAIN,$ANTIVIRUS,$ANTISPAM,$DKIM,$CATCHALL,$ACCOUNTS,$U_DISK"
67-
echo "$SSL,$LETSENCRYPT,$SUSPENDED,$TIME,$DATE"
69+
echo "$SSL,$LETSENCRYPT,$SUSPENDED,$TIME,$DATE,$WEBMAIL_ALIAS.$domain"
6870
}
6971

7072

‎web/add/mail/index.php‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,9 @@
7979
exit();
8080
}
8181

82+
// Set webmail alias
83+
$v_webmail_alias = $data[$v_domain]['WEBMAIL_ALIAS'];
84+
8285
// Check empty fields
8386
if (empty($_POST['v_domain'])) $errors[] = __('domain');
8487
if (empty($_POST['v_account'])) $errors[] = __('account');
@@ -167,13 +170,6 @@
167170
unset($output);
168171
}
169172

170-
// Get webmail url
171-
if (empty($_SESSION['error_msg'])) {
172-
list($http_host, $port) = explode(':', $_SERVER["HTTP_HOST"].":");
173-
$webmail = "http://".$hostname."/".$v_webmail_alias."/";
174-
if (!empty($_SESSION['WEBMAIL_ALIAS'])) $webmail = $_SESSION['WEBMAIL_ALIAS'];
175-
}
176-
177173
// Email login credentials
178174
if ((!empty($v_send_email)) && (empty($_SESSION['error_msg']))) {
179175
$to = $v_send_email;

‎web/edit/mail/index.php‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,8 @@
4545
$v_date = $data[$v_domain]['DATE'];
4646
$v_time = $data[$v_domain]['TIME'];
4747
$v_suspended = $data[$v_domain]['SUSPENDED'];
48+
$v_webmail_alias = $data[$v_domain]['WEBMAIL_ALIAS'];
49+
4850
if ( $v_suspended == 'yes' ) {
4951
$v_status = 'suspended';
5052
} else {

‎web/templates/admin/add_mail_acc.html‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -188,13 +188,9 @@
188188
<td><?=__('SMTP auth method')?>:</td>
189189
<td><div><?=__('Normal password')?></div></td>
190190
</tr>
191-
<?
192-
list($http_host, $port) = explode(':', $_SERVER["HTTP_HOST"].":");
193-
$webmail = "http://".$v_webmail_alias.".".$v_domain."/";
194-
?>
195191
<tr>
196192
<td><?=__('Webmail URL')?>:</td>
197-
<td><div><a class="vst" href="<?=$webmail?>" target="_blank"><?=$webmail?> <i></i></a></div></td>
193+
<td><div><a class="vst" href="<?=$v_webmail_alias?>" target="_blank"><?=$v_webmail_alias?> <i></i></a></div></td>
198194
</tr>
199195
</table>
200196
</div>

‎web/templates/admin/edit_mail_acc.html‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -199,13 +199,9 @@
199199
<td><?=__('SMTP auth method')?>:</td>
200200
<td><div><?=__('Normal password')?></div></td>
201201
</tr>
202-
<?
203-
list($http_host, $port) = explode(':', $_SERVER["HTTP_HOST"].":");
204-
$webmail = "http://".$v_webmail_alias.".$v_domain."/";
205-
?>
206202
<tr>
207203
<td><?=__('Webmail URL')?>:</td>
208-
<td><div><a class="vst" href="<?=$webmail?>" target="_blank"><?=$webmail?> <i></i></a></div></td>
204+
<td><div><a class="vst" href="<?=$v_webmail_alias?>" target="_blank"><?=$v_webmail_alias?> <i></i></a></div></td>
209205
</tr>
210206
</table>
211207
</div>

0 commit comments

Comments
 (0)