Skip to content

Commit 6652818

Browse files
author
Kristan Kenney
committed
Retrieve and set webmail alias via UI
1 parent 3c24081 commit 6652818

File tree

10 files changed

+18
-18
lines changed

10 files changed

+18
-18
lines changed

‎bin/v-list-sys-config‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ json_list() {
4646
"LANGUAGE": "'$LANGUAGE'",
4747
"BACKUP_GZIP": "'$BACKUP_GZIP'",
4848
"BACKUP": "'$BACKUP'",
49-
"MAIL_URL": "'$MAIL_URL'",
49+
"WEBMAIL_ALIAS": "'$WEBMAIL_ALIAS'",
5050
"DB_PMA_URL": "'$DB_PMA_URL'",
5151
"DB_PGA_URL": "'$DB_PGA_URL'",
5252
"SOFTACULOUS": "'$SOFTACULOUS'"
@@ -85,8 +85,8 @@ shell_list() {
8585
echo -n " + $ANTISPAM_SYSTEM"
8686
fi
8787
echo
88-
if [ ! -z "$MAIL_URL" ]; then
89-
echo "Web Mail: hostname + $MAIL_URL"
88+
if [ ! -z "$WEBMAIL_ALIAS" ]; then
89+
echo "Web Mail: hostname + $WEBMAIL_ALIAS"
9090
fi
9191
fi
9292
if [ ! -z "$DB_SYSTEM" ]; then
@@ -139,7 +139,7 @@ plain_list() {
139139
echo -ne "$DNS_SYSTEM\t$DNS_CLUSTER\t$STATS_SYSTEM\t$BACKUP_SYSTEM\t"
140140
echo -ne "$CRON_SYSTEM\t$DISK_QUOTA\t$FIREWALL_SYSTEM\t"
141141
echo -ne "$FIREWALL_EXTENSION\t$REPOSITORY\t$VERSION\t$LANGUAGE\t"
142-
echo -e "$BACKUP_GZIP\t$BACKUP\t$MAIL_URL\t$DB_PMA_URL\t$DB_PGA_URL"
142+
echo -e "$BACKUP_GZIP\t$BACKUP\t$WEBMAIL_ALIAS\t$DB_PMA_URL\t$DB_PGA_URL"
143143
}
144144

145145

@@ -152,7 +152,7 @@ csv_list() {
152152
echo -n "'DNS_SYSTEM','DNS_CLUSTER','STATS_SYSTEM','BACKUP_SYSTEM',"
153153
echo -n "'CRON_SYSTEM','DISK_QUOTA','FIREWALL_SYSTEM',"
154154
echo -n "'FIREWALL_EXTENSION','REPOSITORY',"
155-
echo -n "'VERSION','LANGUAGE','BACKUP_GZIP','BACKUP','MAIL_URL',"
155+
echo -n "'VERSION','LANGUAGE','BACKUP_GZIP','BACKUP','WEBMAIL_ALIAS',"
156156
echo -n "'DB_PMA_URL','DB_PGA_URL'"
157157
echo
158158
echo -n "'$WEB_SYSTEM','$WEB_RGROUPS','$WEB_PORT','$WEB_SSL',"
@@ -162,7 +162,7 @@ csv_list() {
162162
echo -n "'$DNS_SYSTEM','$DNS_CLUSTER','$STATS_SYSTEM','$BACKUP_SYSTEM',"
163163
echo -n "'$CRON_SYSTEM','$DISK_QUOTA','$FIREWALL_SYSTEM','$REPOSITORY',"
164164
echo -n "'$FIREWALL_EXTENSION','$VERSION','$LANGUAGE','$BACKUP_GZIP',"
165-
echo -n "'$BACKUP','$MAIL_URL','$DB_PMA_URL','$DB_PGA_URL'"
165+
echo -n "'$BACKUP','$WEBMAIL_ALIAS','$DB_PMA_URL','$DB_PGA_URL'"
166166
echo
167167
}
168168

‎web/add/mail/index.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@
171171
if (empty($_SESSION['error_msg'])) {
172172
list($http_host, $port) = explode(':', $_SERVER["HTTP_HOST"].":");
173173
$webmail = "http://".$http_host."/webmail/";
174-
if (!empty($_SESSION['MAIL_URL'])) $webmail = $_SESSION['MAIL_URL'];
174+
if (!empty($_SESSION['WEBMAIL_ALIAS'])) $webmail = $_SESSION['WEBMAIL_ALIAS'];
175175
}
176176

177177
// Email login credentials

‎web/edit/server/index.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -195,8 +195,8 @@
195195

196196
// Update webmail url
197197
if (empty($_SESSION['error_msg'])) {
198-
if ($_POST['v_mail_url'] != $_SESSION['MAIL_URL']) {
199-
exec (HESTIA_CMD."v-change-sys-config-value MAIL_URL ".escapeshellarg($_POST['v_mail_url']), $output, $return_var);
198+
if ($_POST['v_webmail_alias'] != $_SESSION['WEBMAIL_ALIAS']) {
199+
exec (HESTIA_CMD."v-change-sys-webmail ".escapeshellarg($_POST['v_webmail_alias']), $output, $return_var);
200200
check_return_code($return_var,$output);
201201
unset($output);
202202
$v_mail_adv = 'yes';

‎web/templates/admin/add_mail_acc.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@
199199
<?
200200
list($http_host, $port) = explode(':', $_SERVER["HTTP_HOST"].":");
201201
$webmail = "http://".$http_host."/webmail/";
202-
if (!empty($_SESSION['MAIL_URL'])) $webmail = $_SESSION['MAIL_URL'];
202+
if (!empty($_SESSION['WEBMAIL_ALIAS'])) $webmail = $_SESSION['WEBMAIL_ALIAS'];
203203
?>
204204
<tr>
205205
<td><?=__('Webmail URL')?>:</td>

‎web/templates/admin/edit_mail_acc.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@
205205
<?
206206
list($http_host, $port) = explode(':', $_SERVER["HTTP_HOST"].":");
207207
$webmail = "http://webmail.".$v_domain."/";
208-
if (!empty($_SESSION['MAIL_URL'])) $webmail = $_SESSION['MAIL_URL'];
208+
if (!empty($_SESSION['WEBMAIL_ALIAS'])) $webmail = $_SESSION['WEBMAIL_ALIAS'];
209209
?>
210210
<tr>
211211
<td><?=__('Webmail URL')?>:</td>

‎web/templates/admin/edit_server.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@
276276
</tr>
277277
<tr>
278278
<td>
279-
<input type="text" size="20" class="vst-input" name="v_mail_url" value="<?php echo $_SESSION['MAIL_URL']; ?>">
279+
<input type="text" size="20" class="vst-input" name="v_webmail_alias" value="<?php echo $_SESSION['WEBMAIL_ALIAS']; ?>">
280280
<br><br>
281281
</td>
282282
</tr>

‎web/templates/admin/list_mail.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<?
1616
list($http_host, $port) = explode(':', $_SERVER["HTTP_HOST"].":");
1717
$webmail = "http://webmail.".$http_host."/";
18-
if (!empty($_SESSION['MAIL_URL'])) $webmail = $_SESSION['MAIL_URL'];
18+
if (!empty($_SESSION['WEBMAIL_ALIAS'])) $webmail = $_SESSION['WEBMAIL_ALIAS'];
1919
?>
2020
</td>
2121
<td class="l-sort-toolbar__search-box step-left">
@@ -80,7 +80,7 @@
8080
<?
8181
list($http_host, $port) = explode(':', $_SERVER["HTTP_HOST"].":");
8282
$webmail = "http://webmail.".$http_host."/";
83-
if (!empty($_SESSION['MAIL_URL'])) $webmail = $_SESSION['MAIL_URL'];
83+
if (!empty($_SESSION['WEBMAIL_ALIAS'])) $webmail = $_SESSION['WEBMAIL_ALIAS'];
8484

8585
foreach ($data as $key => $value) {
8686
++$i;

‎web/templates/admin/list_mail_acc.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<?
1515
list($http_host, $port) = explode(':', $_SERVER["HTTP_HOST"].":");
1616
$webmail = "http://webmail.".$http_host."/";
17-
if (!empty($_SESSION['MAIL_URL'])) $webmail = $_SESSION['MAIL_URL'];
17+
if (!empty($_SESSION['WEBMAIL_ALIAS'])) $webmail = $_SESSION['WEBMAIL_ALIAS'];
1818
?>
1919
</td>
2020
<td class="l-sort-toolbar__search-box step-left">

‎web/templates/user/list_mail.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<?
1616
list($http_host, $port) = explode(':', $_SERVER["HTTP_HOST"].":");
1717
$webmail = "http://".$http_host."/webmail/";
18-
if (!empty($_SESSION['MAIL_URL'])) $webmail = $_SESSION['MAIL_URL'];
18+
if (!empty($_SESSION['WEBMAIL_ALIAS'])) $webmail = $_SESSION['WEBMAIL_ALIAS'];
1919
?>
2020
</td>
2121
<td class="l-sort-toolbar__search-box step-left">
@@ -60,7 +60,7 @@
6060
<?
6161
list($http_host, $port) = explode(':', $_SERVER["HTTP_HOST"].":");
6262
$webmail = "http://".$http_host."/webmail/";
63-
if (!empty($_SESSION['MAIL_URL'])) $webmail = $_SESSION['MAIL_URL'];
63+
if (!empty($_SESSION['WEBMAIL_ALIAS'])) $webmail = $_SESSION['WEBMAIL_ALIAS'];
6464

6565
foreach ($data as $key => $value) {
6666
++$i;

‎web/templates/user/list_mail_acc.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<?
1515
list($http_host, $port) = explode(':', $_SERVER["HTTP_HOST"].":");
1616
$webmail = "http://".$http_host."/webmail/";
17-
if (!empty($_SESSION['MAIL_URL'])) $webmail = $_SESSION['MAIL_URL'];
17+
if (!empty($_SESSION['WEBMAIL_ALIAS'])) $webmail = $_SESSION['WEBMAIL_ALIAS'];
1818
?>
1919
</td>
2020
<td class="l-sort-toolbar__search-box step-left">

0 commit comments

Comments
 (0)