Fix issues with IDN (#1640)

Added test script for bats special focused on IDN

bin/v-add-dns-domain

@@ -18,7 +18,7 @@
 
 # Argument definition
 user=$1
-domain=$2
+domain=$(idn -t --quiet -a "$2" )
 ip=$3
 ns1=$4
 ns2=$5

bin/v-add-dns-on-web-alias

@@ -14,7 +14,7 @@
 
 # Argument definition
 user=$1
-alias=$2
+alias=$(idn -t --quiet -a "$2" )
 ip=$3
 restart=$4
 

bin/v-add-dns-record

@@ -17,12 +17,11 @@
 
 # Argument definition
 user=$1
-domain=$2
-domain_idn=$2
-record=$(idn -t --quiet -u "$3" )
+domain=$(idn -t --quiet -a "$2" )
+record=$(idn -t --quiet -a "$3" )
 record=$(echo "$record" | tr '[:upper:]' '[:lower:]')
 rtype=$(echo "$4"| tr '[:lower:]' '[:upper:]')
-dvalue=$(idn -t --quiet -u "$5" )
+dvalue=$(idn -t --quiet -a "$5" )
 priority=$6
 id=$7
 restart=$8
@@ -67,8 +66,6 @@ fi
 # Additional argument formatting
 format_domain
 format_domain_idn
-# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ?
-
 
 #----------------------------------------------------------#
 #                    Verifications                         #

bin/v-add-domain

@@ -14,7 +14,7 @@
 
 # Argument definition
 user=$1
-domain=$2
+domain=$(idn -t --quiet -a "$2" )
 ip=$3
 restart="${4-yes}"
 

bin/v-add-letsencrypt-domain

@@ -14,7 +14,7 @@
 
 # Argument definition
 user=$1
-domain=$2
+domain=$(idn -t --quiet -a "$2" )
 aliases=$3
 mail=${4// }
 

bin/v-add-mail-account

@@ -14,7 +14,7 @@
 
 # Argument definition
 user=$1
-domain=$2
+domain=$(idn -t --quiet -a "$2" )
 account=$3
 password=$4; HIDE=4
 quota=${5-unlimited}

bin/v-add-mail-account-alias

@@ -14,8 +14,7 @@
 
 # Argument definition
 user=$1
-domain=$2
-domain_idn=$2
+domain=$(idn -t --quiet -a "$2" )
 account=$3
 malias=$4
 
@@ -27,8 +26,6 @@ source $HESTIA/conf/hestia.conf
 # Additional argument formatting
 format_domain
 format_domain_idn
-# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ?
-
 
 #----------------------------------------------------------#
 #                    Verifications                         #

bin/v-add-mail-account-autoreply

@@ -14,8 +14,7 @@
 
 # Argument definition
 user=$1
-domain=$2
-domain_idn=$2
+domain=$(idn -t --quiet -a "$2" )
 account=$3
 autoreply=$4
 
@@ -34,8 +33,6 @@ fi
 # Additional argument formatting
 format_domain
 format_domain_idn
-# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ?
-
 
 #----------------------------------------------------------#
 #                    Verifications                         #

bin/v-add-mail-account-forward

@@ -15,7 +15,7 @@
 # Argument definition
 user=$1
 domain=$2
-domain_idn=$2
+domain_idn=$(idn -t --quiet -a "$2" )
 account=$3
 email_forward=$4
 

bin/v-add-mail-account-fwd-only

@@ -15,7 +15,7 @@
 # Argument definition
 user=$1
 domain=$2
-domain_idn=$2
+domain_idn=$(idn -t --quiet -a "$2" )
 account=$3
 
 # Includes
@@ -33,8 +33,6 @@ fi
 # Additional argument formatting
 format_domain
 format_domain_idn
-# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ?
-
 
 #----------------------------------------------------------#
 #                    Verifications                         #

bin/v-add-mail-domain

@@ -14,7 +14,7 @@
 
 # Argument definition
 user=$1
-domain=$2
+domain=$(idn -t --quiet -a "$2" )
 antispam=${3-yes}
 antivirus=${4-yes}
 dkim=${5-yes}

bin/v-add-mail-domain-antispam

@@ -14,8 +14,7 @@
 
 # Argument definition
 user=$1
-domain=$2
-domain_idn=$2
+domain=$(idn -t --quiet -a "$2" )
 
 # Includes
 source $HESTIA/func/main.sh
@@ -25,7 +24,6 @@ source $HESTIA/conf/hestia.conf
 # Additional argument formatting
 format_domain
 format_domain_idn
-# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ?
 
 
 #----------------------------------------------------------#

bin/v-add-mail-domain-antivirus

@@ -14,8 +14,7 @@
 
 # Argument definition
 user=$1
-domain=$2
-domain_idn=$2
+domain=$(idn -t --quiet -a "$2" )
 
 # Includes
 source $HESTIA/func/main.sh

bin/v-add-mail-domain-catchall

@@ -14,8 +14,7 @@
 
 # Argument definition
 user=$1
-domain=$2
-domain_idn=$2
+domain=$(idn -t --quiet -a "$2" )
 email="$3"
 
 # Includes

bin/v-add-mail-domain-dkim

@@ -14,8 +14,7 @@
 
 # Argument definition
 user=$1
-domain=$2
-domain_idn=$2
+domain=$(idn -t --quiet -a "$2" )
 dkim_size=${3-1024}
 
 # Includes
@@ -33,8 +32,6 @@ fi
 # Additional argument formatting
 format_domain
 format_domain_idn
-# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ?
-
 
 #----------------------------------------------------------#
 #                    Verifications                         #

bin/v-add-mail-domain-smtp-relay

@@ -13,7 +13,7 @@
 
 # Argument definition
 user=$1
-domain=$2
+domain=$(idn -t --quiet -a "$2" )
 host=$3
 username=$4
 password=$5

bin/v-add-mail-domain-ssl

@@ -14,7 +14,7 @@
 
 # Argument definition
 user=$1
-domain=$2
+domain=$(idn -t --quiet -a "$2" )
 ssl_dir=$3
 restart="$3"
 

bin/v-add-remote-dns-domain

@@ -14,7 +14,7 @@
 
 # Argument definition
 user=$1
-domain=$2
+domain=$(idn -t --quiet -a "$2" )
 flush=$3
 
 

bin/v-add-remote-dns-record

@@ -14,7 +14,7 @@
 
 # Argument definition
 user=$1
-domain=$2
+domain=$(idn -t --quiet -a "$2" )
 id=$3
 
 # Includes

bin/v-add-web-domain

@@ -20,8 +20,7 @@
 
 # Argument definition
 user=$1
-domain=$2
-domain_idn=$2
+domain=$(idn -t --quiet -a "$2" )
 ip=$3
 restart=$4      # will be moved to the end soon
 aliases=$5
@@ -33,6 +32,18 @@ source $HESTIA/func/domain.sh
 source $HESTIA/func/ip.sh
 source $HESTIA/conf/hestia.conf
 
+# Rewrite all aliases as puni code 
+aliases_list=$(echo $aliases | tr "," "\n")
+aliases=''
+for alias in $aliases_list
+do
+    if [ -z "$aliases" ]; then
+        aliases=$(idn -t --quiet -a "$alias" )
+    else
+        aliases=$aliases,$(idn -t --quiet -a "$alias" )
+    fi
+done
+
 # Additional argument formatting
 format_domain
 format_domain_idn

bin/v-add-web-domain-alias

@@ -15,9 +15,8 @@
 
 # Argument definition
 user=$1
-domain=$2
-domain_idn=$2
-aliases=$3
+domain=$(idn -t --quiet -a "$2" )
+aliases=$(idn -t --quiet -a "$3" )
 restart="$4"
 
 # Includes
@@ -29,7 +28,6 @@ source $HESTIA/conf/hestia.conf
 # Additional argument formatting
 format_domain
 format_domain_idn
-# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ?
 format_aliases
 
 

bin/v-add-web-domain-allow-users

@@ -16,8 +16,7 @@
 
 # Argument definition
 user=$1
-domain=$2
-domain_idn=$2
+domain=$(idn -t --quiet -a "$2" )
 
 # Includes
 source $HESTIA/func/main.sh

bin/v-add-web-domain-backend

@@ -14,7 +14,7 @@
 
 # Argument definition
 user=$1
-domain=$2
+domain=$(idn -t --quiet -a "$2" )
 template=${3-default}
 restart=$4
 

bin/v-add-web-domain-fast-cgi-cache

@@ -15,7 +15,7 @@
 
 # Argument definition
 user=$1
-domain=$2
+domain=$(idn -t --quiet -a "$2" )
 debug=$3
 
 # Includes

bin/v-add-web-domain-ftp

@@ -14,8 +14,7 @@
 
 # Argument definition
 user=$1
-domain=$2
-domain_idn=$2
+domain=$(idn -t --quiet -a "$2" )
 ftp_user=${1}_${3}
 password=$4; HIDE=4
 ftp_path=$5
@@ -28,7 +27,6 @@ source $HESTIA/conf/hestia.conf
 # Additional argument formatting
 format_domain
 format_domain_idn
-# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ?
 
 
 #----------------------------------------------------------#

bin/v-add-web-domain-httpauth

@@ -14,7 +14,7 @@
 
 # Argument definition
 user=$1
-domain=$2
+domain=$(idn -t --quiet -a "$2" )
 auth_user=$3
 password=$4; HIDE=4
 restart=${5-yes}

bin/v-add-web-domain-proxy

@@ -15,7 +15,7 @@
 
 # Argument definition
 user=$1
-domain=$2
+domain=$(idn -t --quiet -a "$2" )
 template=$3
 default_extentions="jpg,jpeg,gif,png,ico,svg,css,zip,tgz,gz,rar,bz2,doc,xls,\
 exe,pdf,ppt,txt,odt,ods,odp,odf,tar,wav,bmp,rtf,js,mp3,avi,mpeg,flv,html,htm"

bin/v-add-web-domain-ssl

@@ -19,7 +19,7 @@
 
 # Argument definition
 user=$1
-domain=$2
+domain=$(idn -t --quiet -a "$2" )
 ssl_dir=$3
 ssl_home=${4-same}
 restart="$5"

bin/v-add-web-domain-ssl-force

@@ -14,7 +14,7 @@
 
 # Argument definition
 user=$1
-domain=$2
+domain=$(idn -t --quiet -a "$2" )
 
 # Includes
 source $HESTIA/func/main.sh

bin/v-add-web-domain-ssl-hsts

@@ -12,7 +12,7 @@
 
 # Argument definition
 user=$1
-domain=$2
+domain=$(idn -t --quiet -a "$2" )
 
 # Includes
 source $HESTIA/func/main.sh

bin/v-add-web-domain-ssl-preset

@@ -14,7 +14,7 @@
 
 # Argument definition
 user=$1
-domain=$2
+domain=$(idn -t --quiet -a "$2" )
 ssl=$3
 
 # Includes

bin/v-add-web-domain-stats

@@ -17,8 +17,7 @@
 
 # Argument definition
 user=$1
-domain=$2
-domain_idn=$2
+domain=$(idn -t --quiet -a "$2" )
 type=$3
 
 # Includes

bin/v-add-web-domain-stats-user

@@ -14,7 +14,7 @@
 
 # Argument definition
 user=$1
-domain=$2
+domain=$(idn -t --quiet -a "$2" )
 stats_user=$3
 password=$4; HIDE=4
 restart=$5

bin/v-change-dns-domain-exp

@@ -15,8 +15,7 @@
 
 # Argument definition
 user=$1
-domain=$2
-domain_idn=$2
+domain=$(idn -t --quiet -a "$2" )
 exp=$3
 
 # Includes
@@ -26,7 +25,6 @@ source $HESTIA/conf/hestia.conf
 # Additional argument formatting
 format_domain
 format_domain_idn
-# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ?
 
 
 #----------------------------------------------------------#

bin/v-change-dns-domain-ip

@@ -14,8 +14,7 @@
 
 # Argument definition
 user=$1
-domain=$2
-domain_idn=$2
+domain=$(idn -t --quiet -a "$2" )
 ip=$3
 restart=$4
 
@@ -27,7 +26,7 @@ source $HESTIA/conf/hestia.conf
 # Additional argument formatting
 format_domain
 format_domain_idn
-# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ?
+
 
 
 #----------------------------------------------------------#

bin/v-change-dns-domain-soa

@@ -15,8 +15,7 @@
 
 # Argument definition
 user=$1
-domain=$2
-domain_idn=$2
+domain=$(idn -t --quiet -a "$2" )
 soa=$(echo $3 | sed -e 's/\.*$//g' -e 's/^\.*//g')
 restart=$4
 
@@ -28,7 +27,6 @@ source $HESTIA/conf/hestia.conf
 # Additional argument formatting
 format_domain
 format_domain_idn
-# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ?
 
 
 #----------------------------------------------------------#

bin/v-change-dns-domain-tpl

@@ -16,8 +16,7 @@
 
 # Argument definition
 user=$1
-domain=$2
-domain_idn=$2
+domain=$(idn -t --quiet -a "$2" )
 template=$3
 restart=$4
 

bin/v-change-dns-domain-ttl

@@ -14,8 +14,7 @@
 
 # Argument definition
 user=$1
-domain=$2
-domain_idn=$2
+domain=$(idn -t --quiet -a "$2" )
 ttl=$3
 restart=$4
 

bin/v-change-dns-record

@@ -14,8 +14,7 @@
 
 # Argument definition
 user=$1
-domain=$2
-domain_idn=$2
+domain=$(idn -t --quiet -a "$2" )
 id=$3
 record=$4
 type=$5

bin/v-change-dns-record-id

@@ -14,8 +14,7 @@
 
 # Argument definition
 user=$1
-domain=$2
-domain_idn=$2
+domain=$(idn -t --quiet -a "$2" )
 id=$3
 newid=$4
 restart=$5
@@ -28,7 +27,6 @@ source $HESTIA/conf/hestia.conf
 # Additional argument formatting
 format_domain
 format_domain_idn
-# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ?
 
 
 #----------------------------------------------------------#

bin/v-change-domain-owner

@@ -13,7 +13,7 @@
 #----------------------------------------------------------#
 
 # Argument definition
-domain=$1
+domain=$(idn -t --quiet -a "$1" )
 user=$2
 
 # Includes

bin/v-change-mail-account-password

@@ -14,8 +14,7 @@
 
 # Argument definition
 user=$1
-domain=$2
-domain_idn=$2
+domain=$(idn -t --quiet -a "$2" )
 account=$3
 password=$4; HIDE=4
 
@@ -27,7 +26,6 @@ source $HESTIA/conf/hestia.conf
 # Additional argument formatting
 format_domain
 format_domain_idn
-# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ?
 
 
 #----------------------------------------------------------#

bin/v-change-mail-account-quota

@@ -14,8 +14,7 @@
 
 # Argument definition
 user=$1
-domain=$2
-domain_idn=$2
+domain=$(idn -t --quiet -a "$2" )
 account=$3
 quota=$4
 
@@ -27,8 +26,6 @@ source $HESTIA/conf/hestia.conf
 # Additional argument formatting
 format_domain
 format_domain_idn
-# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ?
-
 
 #----------------------------------------------------------#
 #                    Verifications                         #

bin/v-change-mail-domain-catchall

@@ -14,8 +14,7 @@
 
 # Argument definition
 user=$1
-domain=$2
-domain_idn=$2
+domain=$(idn -t --quiet -a "$2" )
 email=$3
 
 # Includes

bin/v-change-mail-domain-sslcert

@@ -13,8 +13,7 @@
 
 # Argument definition
 user=$1
-domain=$2
-domain_idn=$2
+domain=$(idn -t --quiet -a "$2" )
 restart=$3
 
 # Includes

bin/v-change-remote-dns-domain-exp

@@ -12,7 +12,7 @@
 
 # Argument definition
 user=$1
-domain=$2
+domain=$(idn -t --quiet -a "$2" )
 
 # Includes
 source $HESTIA/func/main.sh

bin/v-change-remote-dns-domain-soa

@@ -14,7 +14,7 @@
 
 # Argument definition
 user=$1
-domain=$2
+domain=$(idn -t --quiet -a "$2" )
 
 # Includes
 source $HESTIA/func/main.sh

bin/v-change-remote-dns-domain-ttl

@@ -14,7 +14,7 @@
 
 # Argument definition
 user=$1
-domain=$2
+domain=$(idn -t --quiet -a "$2" )
 
 # Includes
 source $HESTIA/func/main.sh

bin/v-change-web-domain-backend-tpl

@@ -14,8 +14,7 @@
 
 # Argument definition
 user=$1
-domain=$2
-domain_idn=$2
+domain=$(idn -t --quiet -a "$2" )
 template=$3
 restart=$4
 

bin/v-change-web-domain-dirlist

@@ -14,7 +14,7 @@
 
 # Argument defenition
 user=$1
-domain=$2
+domain=$(idn -t --quiet -a "$2" )
 mode=$3
 
 # Includes

bin/v-change-web-domain-docroot

@@ -21,7 +21,7 @@
 
 # Argument definition
 user=$1
-domain=$2
+domain=$(idn -t --quiet -a "$2" )
 
 # Export target domain and directory
 # so they are correctly passed through to domain.sh

bin/v-change-web-domain-ftp-password

@@ -14,8 +14,7 @@
 
 # Argument definition
 user=$1
-domain=$2
-domain_idn=$2
+domain=$(idn -t --quiet -a "$2" )
 ftp_user=$3
 password=$4; HIDE=4
 

bin/v-change-web-domain-ftp-path

@@ -14,8 +14,7 @@
 
 # Argument definition
 user=$1
-domain=$2
-domain_idn=$2
+domain=$(idn -t --quiet -a "$2" )
 ftp_user=$3
 ftp_path=$4
 

bin/v-change-web-domain-httpauth

@@ -14,7 +14,7 @@
 
 # Argument definition
 user=$1
-domain=$2
+domain=$(idn -t --quiet -a "$2" )
 auth_user=$3
 password=$4; HIDE=4
 

bin/v-change-web-domain-ip

@@ -14,8 +14,7 @@
 
 # Argument definition
 user=$1
-domain=$2
-domain_idn=$2
+domain=$(idn -t --quiet -a "$2" )
 ip=$3
 restart=$4
 
@@ -28,8 +27,6 @@ source $HESTIA/conf/hestia.conf
 # Additional argument formatting
 format_domain
 format_domain_idn
-# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ?
-
 
 #----------------------------------------------------------#
 #                    Verifications                         #

bin/v-change-web-domain-name

@@ -14,9 +14,8 @@
 
 # Argument defenition
 user=$1
-domain=$2
-domain_idn=$2
-new_domain=$3
+domain=$(idn -t --quiet -a "$2" )
+new_domain=$(idn -t --quiet -a "$3" )
 restart=$4
 
 # Includes

bin/v-change-web-domain-proxy-tpl

@@ -14,8 +14,7 @@
 
 # Argument definition
 user=$1
-domain=$2
-domain_idn=$2
+domain=$(idn -t --quiet -a "$2" )
 template=$3
 default_extentions="jpg,jpeg,gif,png,ico,svg,css,zip,tgz,gz,rar,bz2,doc,xls,\
 exe,pdf,ppt,txt,odt,ods,odp,odf,tar,wav,bmp,rtf,js,mp3,avi,mpeg,flv,html,htm"
@@ -31,8 +30,6 @@ source $HESTIA/conf/hestia.conf
 # Additional argument formatting
 format_domain
 format_domain_idn
-# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ?
-
 
 #----------------------------------------------------------#
 #                    Verifications                         #

bin/v-change-web-domain-sslcert

@@ -15,8 +15,7 @@
 
 # Argument definition
 user=$1
-domain=$2
-domain_idn=$2
+domain=$(idn -t --quiet -a "$2" )
 ssl_dir=$3
 restart=$4
 
@@ -28,7 +27,6 @@ source $HESTIA/conf/hestia.conf
 # Additional argument formatting
 format_domain
 format_domain_idn
-# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ?
 
 
 #----------------------------------------------------------#

bin/v-change-web-domain-sslhome

@@ -14,8 +14,7 @@
 
 # Argument definition
 user=$1
-domain=$2
-domain_idn=$2
+domain=$(idn -t --quiet -a "$2" )
 ssl_home=$3
 restart=$4
 
@@ -27,8 +26,6 @@ source $HESTIA/conf/hestia.conf
 # Additional argument formatting
 format_domain
 format_domain_idn
-# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ?
-
 
 #----------------------------------------------------------#
 #                    Verifications                         #

bin/v-change-web-domain-stats

@@ -15,8 +15,7 @@
 
 # Argument definition
 user=$1
-domain=$2
-domain_idn=$2
+domain=$(idn -t --quiet -a "$2" )
 type=$3
 
 # Includes

bin/v-change-web-domain-tpl

@@ -15,8 +15,7 @@
 
 # Argument definition
 user=$1
-domain=$2
-domain_idn=$2
+domain=$(idn -t --quiet -a "$2" )
 template=$3
 restart=$4
 

bin/v-delete-dns-domain

@@ -15,7 +15,7 @@
 
 # Argument definition
 user=$1
-domain=$2
+domain=$(idn -t --quiet -a "$2" )
 restart="$3"
 
 # Includes

bin/v-delete-dns-domains-src

@@ -14,7 +14,7 @@
 
 # Argument definition
 user=$1
-src=$2
+src=$(idn -t --quiet -a "$2" )
 restart=$3
 
 # Includes

bin/v-delete-dns-on-web-alias

@@ -15,7 +15,7 @@
 # Argument definition
 user=$1
 domain=$2
-domain_idn=$2
+domain_idn=$(idn -t --quiet -a "$2" )
 dom_alias=$(idn -t --quiet -u "$3" )
 dom_alias=$(echo $dom_alias |sed -e 's/\.*$//g' -e 's/^\.*//g')
 dom_alias=$(echo $dom_alias |tr '[:upper:]' '[:lower:]')

bin/v-delete-dns-record

@@ -14,8 +14,7 @@
 
 # Argument definition
 user=$1
-domain=$2
-domain_idn=$2
+domain=$(idn -t --quiet -a "$2" )
 id=$3
 restart=$4
 

bin/v-delete-domain

@@ -14,7 +14,7 @@
 
 # Argument definition
 user=$1
-domain=$2
+domain=$(idn -t --quiet -a "$2" )
 restart="${3-yes}"
 
 # Includes

bin/v-delete-letsencrypt-domain

@@ -14,7 +14,7 @@
 
 # Argument definition
 user=$1
-domain=$2
+domain=$(idn -t --quiet -a "$2" )
 restart=$3
 mail=$4
 

bin/v-delete-mail-account

@@ -14,8 +14,7 @@
 
 # Argument definition
 user=$1
-domain=$2
-domain_idn=$2
+domain=$(idn -t --quiet -a "$2" )
 account=$3
 
 # Includes

bin/v-delete-mail-account-alias

@@ -14,8 +14,7 @@
 
 # Argument definition
 user=$1
-domain=$2
-domain_idn=$2
+domain=$(idn -t --quiet -a "$2" )
 account=$3
 malias=$4
 

bin/v-delete-mail-account-autoreply

@@ -14,8 +14,7 @@
 
 # Argument definition
 user=$1
-domain=$2
-domain_idn=$2
+domain=$(idn -t --quiet -a "$2" )
 account=$3
 malias=$4
 

bin/v-delete-mail-account-forward

@@ -14,8 +14,7 @@
 
 # Argument definition
 user=$1
-domain=$2
-domain_idn=$2
+domain=$(idn -t --quiet -a "$2" )
 account=$3
 forward=$4
 

bin/v-delete-mail-account-fwd-only

@@ -14,8 +14,7 @@
 
 # Argument definition
 user=$1
-domain=$2
-domain_idn=$2
+domain=$(idn -t --quiet -a "$2" )
 account=$3
 
 # Includes

bin/v-delete-mail-domain

@@ -15,8 +15,7 @@
 
 # Argument definition
 user=$1
-domain=$2
-domain_idn=$2
+domain=$(idn -t --quiet -a "$2" )
 
 # Includes
 source $HESTIA/func/main.sh

bin/v-delete-mail-domain-antispam

@@ -14,8 +14,7 @@
 
 # Argument definition
 user=$1
-domain=$2
-domain_idn=$2
+domain=$(idn -t --quiet -a "$2" )
 
 # Includes
 source $HESTIA/func/main.sh

bin/v-delete-mail-domain-antivirus

@@ -14,8 +14,7 @@
 
 # Argument definition
 user=$1
-domain=$2
-domain_idn=$2
+domain=$(idn -t --quiet -a "$2" )
 
 # Includes
 source $HESTIA/func/main.sh

bin/v-delete-mail-domain-catchall

@@ -14,8 +14,7 @@
 
 # Argument definition
 user=$1
-domain=$2
-domain_idn=$2
+domain=$(idn -t --quiet -a "$2" )
 
 # Includes
 source $HESTIA/func/main.sh

bin/v-delete-mail-domain-dkim

@@ -14,7 +14,7 @@
 
 # Argument definition
 user=$1
-domain=$2
+domain=$(idn -t --quiet -a "$2" )
 domain=$(echo $domain | tr '[:upper:]' '[:lower:]')
 
 # Includes

bin/v-delete-mail-domain-smtp-relay

@@ -13,7 +13,7 @@
 
 # Argument definition
 user=$1
-domain=$2
+domain=$(idn -t --quiet -a "$2" )
 
 # Includes
 source $HESTIA/func/main.sh

bin/v-delete-mail-domain-ssl

@@ -13,7 +13,7 @@
 
 # Argument definition
 user=$1
-domain=$2
+domain=$(idn -t --quiet -a "$2" )
 
 # Includes
 source $HESTIA/func/main.sh

bin/v-delete-remote-dns-domain

@@ -14,7 +14,7 @@
 
 # Argument definition
 user=$1
-domain=$2
+domain=$(idn -t --quiet -a "$2" )
 
 # Includes
 source $HESTIA/func/main.sh

bin/v-delete-remote-dns-record

@@ -14,7 +14,7 @@
 
 # Argument definition
 user=$1
-domain=$2
+domain=$(idn -t --quiet -a "$2" )
 id=$3
 
 # Includes

bin/v-delete-web-domain

@@ -17,8 +17,7 @@
 
 # Argument definition
 user=$1
-domain=$2
-domain_idn=$2
+domain=$(idn -t --quiet -a "$2" )
 restart=$3
 
 # Includes
@@ -30,8 +29,6 @@ source $HESTIA/conf/hestia.conf
 # Additional argument formatting
 format_domain
 format_domain_idn
-# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ?
-
 
 #----------------------------------------------------------#
 #                    Verifications                         #

bin/v-delete-web-domain-alias

@@ -15,8 +15,8 @@
 
 # Argument definition
 user=$1
-domain=$2
-dom_alias=$3
+domain=$(idn -t --quiet -a "$2" )
+dom_alias=$(idn -t --quiet -a "$3" )
 restart=$4
 
 # Includes

bin/v-delete-web-domain-allow-users

@@ -16,8 +16,7 @@
 
 # Argument definition
 user=$1
-domain=$2
-domain_idn=$2
+domain=$(idn -t --quiet -a "$2" )
 
 # Includes
 source $HESTIA/func/main.sh

bin/v-delete-web-domain-backend

@@ -14,8 +14,7 @@
 
 # Argument definition
 user=$1
-domain=$2
-domain_idn=$2
+domain=$(idn -t --quiet -a "$2" )
 restart=$3
 
 # Includes

bin/v-delete-web-domain-fast-cgi-cache

@@ -13,7 +13,7 @@
 
 # Argument definition
 user=$1
-domain=$2
+domain=$(idn -t --quiet -a "$2" )
 restart=$3
 
 # Includes

bin/v-delete-web-domain-ftp

@@ -14,8 +14,7 @@
 
 # Argument definition
 user=$1
-domain=$2
-domain_idn=$2
+domain=$(idn -t --quiet -a "$2" )
 ftp_user=$3
 
 # Includes

bin/v-delete-web-domain-httpauth

@@ -14,7 +14,7 @@
 
 # Argument definition
 user=$1
-domain=$2
+domain=$(idn -t --quiet -a "$2" )
 auth_user=$3
 restart=${4-yes}
 

bin/v-delete-web-domain-proxy

@@ -14,8 +14,7 @@
 
 # Argument definition
 user=$1
-domain=$2
-domain_idn=$2
+domain=$(idn -t --quiet -a "$2" )
 restart=$3
 
 # Includes

bin/v-delete-web-domain-ssl

@@ -14,8 +14,7 @@
 
 # Argument definition
 user=$1
-domain=$2
-domain_idn=$2
+domain=$(idn -t --quiet -a "$2" )
 restart=$3
 
 # Includes

bin/v-delete-web-domain-ssl-force

@@ -14,7 +14,7 @@
 
 # Argument definition
 user=$1
-domain=$2
+domain=$(idn -t --quiet -a "$2" )
 restart=$3
 
 # Includes

bin/v-delete-web-domain-ssl-hsts

@@ -14,7 +14,7 @@
 
 # Argument definition
 user=$1
-domain=$2
+domain=$(idn -t --quiet -a "$2" )
 restart=$3
 
 # Includes

bin/v-delete-web-domain-stats

@@ -15,7 +15,7 @@
 
 # Argument definition
 user=$1
-domain=$2
+domain=$(idn -t --quiet -a "$2" )
 domain_idn=$2
 
 # Includes

bin/v-delete-web-domain-stats-user

@@ -17,7 +17,7 @@
 
 # Argument definition
 user=$1
-domain=$2
+domain=$(idn -t --quiet -a "$2" )
 restart=$3
 
 # Includes

bin/v-get-mail-account-value

@@ -14,8 +14,7 @@
 
 # Argument definition
 user=$1
-domain=$2
-domain_idn=$2
+domain=$(idn -t --quiet -a "$domain" )
 account=$3
 key=$4
 
@@ -25,8 +24,6 @@ source $HESTIA/func/main.sh
 # Additional argument formatting
 format_domain
 format_domain_idn
-# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ?
-
 
 #----------------------------------------------------------#
 #                    Verifications                         #

bin/v-get-mail-domain-value

@@ -14,8 +14,7 @@
 
 # Argument definition
 user=$1
-domain=$2
-domain_idn=$2
+domain=$(idn -t --quiet -a "$2" )
 key=$3
 
 # Includes

bin/v-insert-dns-record

@@ -12,7 +12,7 @@
 
 # Argument definition
 user=$1
-domain=$2
+domain=$(idn -t --quiet -a "$2" )
 data=$3
 restart=$4
 

bin/v-insert-dns-records

@@ -12,7 +12,7 @@
 
 # Argument definition
 user=$1
-domain=$2
+domain=$(idn -t --quiet -a "$2" )
 data_file=$3
 restart=$4
 

bin/v-list-dns-domain

@@ -14,7 +14,7 @@
 
 # Argument definition
 user=$1
-domain=$2
+domain=$(idn -t --quiet -a "$2" )
 format=${3-shell}
 
 # Includes

bin/v-list-dns-records

@@ -14,7 +14,7 @@
 
 # Argument definition
 user=$1
-domain=$2
+domain=$(idn -t --quiet -a "$2" )
 format=${3-shell}
 
 # Includes