Skip to content

Commit a378101

Browse files
authored
Merge pull request hestiacp#1053 from hestiacp/fix/1052-issues_idn_domains
hestiacp#1052 Can not delete cyrillic DNS domain
2 parents 479cbf8 + 335c208 commit a378101

File tree

7 files changed

+5
-7
lines changed

7 files changed

+5
-7
lines changed

bin/v-add-mail-domain-ssl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ if [[ "$domain" =~ .*\.$ ]]; then
2828
domain=$(echo "$domain" |sed -e "s/\.$//")
2929
fi
3030

31-
domain=$(idn -t --quiet -u "$domain" )
3231
domain_idn=$(idn -t --quiet -a "$domain")
3332

3433
# Includes

bin/v-add-sys-webmail

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ if [[ "$domain" =~ .*\.$ ]]; then
2626
domain=$(echo "$domain" |sed -e "s/\.$//")
2727
fi
2828

29-
domain=$(idn -t --quiet -u "$domain" )
3029
domain_idn=$(idn -t --quiet -a "$domain")
3130

3231
# Includes

bin/v-add-web-domain-ssl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ if [[ "$domain" =~ .*\.$ ]]; then
3232
domain=$(echo "$domain" |sed -e "s/\.$//")
3333
fi
3434

35-
domain=$(idn -t --quiet -u "$domain" )
35+
domain=$domain
3636
domain_idn=$(idn -t --quiet -a "$domain")
3737

3838
# Includes

bin/v-delete-dns-domain

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
# Argument definition
1414
user=$1
15-
domain=$(idn -t --quiet -u "$2" )
15+
domain=$2
1616
restart="$3"
1717

1818
# Includes

bin/v-delete-mail-domain-dkim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
# Argument definition
1313
user=$1
14-
domain=$(idn -t --quiet -u "$2" )
14+
domain=$2
1515
domain=$(echo $domain | tr '[:upper:]' '[:lower:]')
1616

1717
# Includes

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
# Argument definition
1616
user=$1
17-
domain=$(idn -t --quiet -u "$2" )
17+
domain=$2
1818
restart=$3
1919

2020
# Includes

bin/v-search-domain-owner

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#----------------------------------------------------------#
1111

1212
# Argument definition
13-
domain=$(idn -t --quiet -u "$1" )
13+
domain=$1
1414
type=${2-any}
1515

1616
# Includes

0 commit comments

Comments
 (0)