Skip to content

Commit 64973ac

Browse files
author
Kristan Kenney
committed
Revert "Fix issues with IDN (hestiacp#1640)"
This reverts commit 65ac4d4.
1 parent 5305ce3 commit 64973ac

File tree

134 files changed

+251
-767
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

134 files changed

+251
-767
lines changed

bin/v-add-dns-domain

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

1919
# Argument definition
2020
user=$1
21-
domain=$(idn -t --quiet -a "$2" )
21+
domain=$2
2222
ip=$3
2323
ns1=$4
2424
ns2=$5

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

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-
alias=$(idn -t --quiet -a "$2" )
17+
alias=$2
1818
ip=$3
1919
restart=$4
2020

bin/v-add-dns-record

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@
1717

1818
# Argument definition
1919
user=$1
20-
domain=$(idn -t --quiet -a "$2" )
20+
domain=$2
21+
domain_idn=$2
2122
record=$(idn -t --quiet -u "$3" )
2223
record=$(echo "$record" | tr '[:upper:]' '[:lower:]')
2324
rtype=$(echo "$4"| tr '[:lower:]' '[:upper:]')
@@ -71,6 +72,8 @@ fi
7172
# Additional argument formatting
7273
format_domain
7374
format_domain_idn
75+
# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ?
76+
7477

7578
#----------------------------------------------------------#
7679
# Verifications #

bin/v-add-domain

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 -a "$2" )
17+
domain=$2
1818
ip=$3
1919
restart="${4-yes}"
2020

bin/v-add-letsencrypt-domain

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 -a "$2" )
17+
domain=$2
1818
aliases=$3
1919
mail=${4// }
2020

bin/v-add-mail-account

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 -a "$2" )
17+
domain=$2
1818
account=$3
1919
password=$4; HIDE=4
2020
quota=${5-unlimited}

bin/v-add-mail-account-alias

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

1515
# Argument definition
1616
user=$1
17-
domain=$(idn -t --quiet -a "$2" )
17+
domain=$2
18+
domain_idn=$2
1819
account=$3
1920
malias=$4
2021

@@ -26,6 +27,8 @@ source $HESTIA/conf/hestia.conf
2627
# Additional argument formatting
2728
format_domain
2829
format_domain_idn
30+
# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ?
31+
2932

3033
#----------------------------------------------------------#
3134
# Verifications #

bin/v-add-mail-account-autoreply

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

1515
# Argument definition
1616
user=$1
17-
domain=$(idn -t --quiet -a "$2" )
17+
domain=$2
18+
domain_idn=$2
1819
account=$3
1920
autoreply=$4
2021

@@ -33,6 +34,8 @@ fi
3334
# Additional argument formatting
3435
format_domain
3536
format_domain_idn
37+
# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ?
38+
3639

3740
#----------------------------------------------------------#
3841
# Verifications #

bin/v-add-mail-account-forward

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
# Argument definition
1616
user=$1
1717
domain=$2
18-
domain_idn=$(idn -t --quiet -a "$2" )
18+
domain_idn=$2
1919
account=$3
2020
email_forward=$4
2121

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
# Argument definition
1616
user=$1
1717
domain=$2
18-
domain_idn=$(idn -t --quiet -a "$2" )
18+
domain_idn=$2
1919
account=$3
2020

2121
# Includes
@@ -33,6 +33,8 @@ fi
3333
# Additional argument formatting
3434
format_domain
3535
format_domain_idn
36+
# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ?
37+
3638

3739
#----------------------------------------------------------#
3840
# Verifications #

0 commit comments

Comments
 (0)