Просмотр исходного кода

Multiple small fixes regarding UI and installer (#2404)

* Fix #2398 Press any key to continue

* Fix #2391 Sort order doesn't update

* #2392 Keep mail.domain.com as  hostname for imap / smtp
Jaap Marcus 4 лет назад
Родитель
Сommit
424bfe63bd

+ 1 - 1
bin/v-change-user-sort-order

@@ -39,7 +39,7 @@ check_hestia_demo_mode
 #                       Action                             #
 #----------------------------------------------------------#
 
-$HESTIA/bin/v-change-user-config-value "$user" "$PREF_UI_SORT" "$sort_order"
+$HESTIA/bin/v-change-user-config-value "$user" 'PREF_UI_SORT' "$sort_order"
 
 #----------------------------------------------------------#
 #                       Hestia                             #

+ 1 - 2
install/hst-install-debian.sh

@@ -2149,8 +2149,7 @@ sort_config_file
 
 if [ "$interactive" = 'yes' ]; then
     echo "[ ! ] IMPORTANT: The system will now reboot to complete the installation process."
-    echo -n "                 Press any key to continue!"
-    read reboot
+    read -n 1 -s -r -p "Press any key to continue"
     reboot
 else
     echo "[ ! ] IMPORTANT: You must restart the system before continuing!"

+ 1 - 2
install/hst-install-ubuntu.sh

@@ -2168,8 +2168,7 @@ sort_config_file
 
 if [ "$interactive" = 'yes' ]; then
     echo "[ ! ] IMPORTANT: The system will now reboot to complete the installation process."
-    echo -n "                 Press any key to continue!"
-    read reboot
+    read -n 1 -s -r -p "Press any key to continue"
     reboot
 else
     echo "[ ! ] IMPORTANT: You must restart the system before continuing!"

+ 2 - 2
web/templates/pages/edit_mail_acc.html

@@ -177,10 +177,10 @@
 							<tr>
 								<td colspan="2">
 									<select id="mail_configuration" class="vst-list flat">
-										<option v_type="hostname" domain="<?=$v_domain?>"><?=_('Use domain hostname');?></option>
+										<option v_type="hostname" domain="<?='mail.'.$v_domain?>"><?=_('Use domain hostname');?></option>
 										<option v_type="starttls"><?=_('Use STARTTLS');?></option>
 										<option v_type="ssl"><?=_('Use SSL / TLS');?></option>
-										<option v_type="no_encryption" domain="<?=htmlentities(trim($v_domain, "'"))?>" no_encryption="<?=_('No encryption');?>"><?=_('No encryption');?></option>
+										<option v_type="no_encryption" domain="<?=htmlentities(trim('mail.'.$v_domain, "'"))?>" no_encryption="<?=_('No encryption');?>"><?=_('No encryption');?></option>
 									</select>
 								</td>
 							</tr>