Skip to content

Commit 424bfe6

Browse files
authored
Multiple small fixes regarding UI and installer (hestiacp#2404)
* Fix hestiacp#2398 Press any key to continue * Fix hestiacp#2391 Sort order doesn't update * hestiacp#2392 Keep mail.domain.com as hostname for imap / smtp
1 parent 05d1d01 commit 424bfe6

File tree

4 files changed

+5
-7
lines changed

4 files changed

+5
-7
lines changed

bin/v-change-user-sort-order

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ check_hestia_demo_mode
3939
# Action #
4040
#----------------------------------------------------------#
4141

42-
$HESTIA/bin/v-change-user-config-value "$user" "$PREF_UI_SORT" "$sort_order"
42+
$HESTIA/bin/v-change-user-config-value "$user" 'PREF_UI_SORT' "$sort_order"
4343

4444
#----------------------------------------------------------#
4545
# Hestia #

install/hst-install-debian.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2149,8 +2149,7 @@ sort_config_file
21492149

21502150
if [ "$interactive" = 'yes' ]; then
21512151
echo "[ ! ] IMPORTANT: The system will now reboot to complete the installation process."
2152-
echo -n " Press any key to continue!"
2153-
read reboot
2152+
read -n 1 -s -r -p "Press any key to continue"
21542153
reboot
21552154
else
21562155
echo "[ ! ] IMPORTANT: You must restart the system before continuing!"

install/hst-install-ubuntu.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2168,8 +2168,7 @@ sort_config_file
21682168

21692169
if [ "$interactive" = 'yes' ]; then
21702170
echo "[ ! ] IMPORTANT: The system will now reboot to complete the installation process."
2171-
echo -n " Press any key to continue!"
2172-
read reboot
2171+
read -n 1 -s -r -p "Press any key to continue"
21732172
reboot
21742173
else
21752174
echo "[ ! ] IMPORTANT: You must restart the system before continuing!"

web/templates/pages/edit_mail_acc.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -177,10 +177,10 @@
177177
<tr>
178178
<td colspan="2">
179179
<select id="mail_configuration" class="vst-list flat">
180-
<option v_type="hostname" domain="<?=$v_domain?>"><?=_('Use domain hostname');?></option>
180+
<option v_type="hostname" domain="<?='mail.'.$v_domain?>"><?=_('Use domain hostname');?></option>
181181
<option v_type="starttls"><?=_('Use STARTTLS');?></option>
182182
<option v_type="ssl"><?=_('Use SSL / TLS');?></option>
183-
<option v_type="no_encryption" domain="<?=htmlentities(trim($v_domain, "'"))?>" no_encryption="<?=_('No encryption');?>"><?=_('No encryption');?></option>
183+
<option v_type="no_encryption" domain="<?=htmlentities(trim('mail.'.$v_domain, "'"))?>" no_encryption="<?=_('No encryption');?>"><?=_('No encryption');?></option>
184184
</select>
185185
</td>
186186
</tr>

0 commit comments

Comments
 (0)