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

#1052 Can not delete cyrillic DNS domain

Multiple functions didn't work with IDN/Cyrilic domains
This should fix the issues
Jaap Marcus 5 лет назад
Родитель
Сommit
335c2082e9

+ 0 - 1
bin/v-add-mail-domain-ssl

@@ -28,7 +28,6 @@ if [[ "$domain" =~ .*\.$ ]]; then
     domain=$(echo "$domain" |sed -e "s/\.$//")
 fi
 
-domain=$(idn -t --quiet -u "$domain" )
 domain_idn=$(idn -t --quiet -a "$domain")
 
 # Includes

+ 0 - 1
bin/v-add-sys-webmail

@@ -26,7 +26,6 @@ if [[ "$domain" =~ .*\.$ ]]; then
     domain=$(echo "$domain" |sed -e "s/\.$//")
 fi
 
-domain=$(idn -t --quiet -u "$domain" )
 domain_idn=$(idn -t --quiet -a "$domain")
 
 # Includes

+ 1 - 1
bin/v-add-web-domain-ssl

@@ -32,7 +32,7 @@ if [[ "$domain" =~ .*\.$ ]]; then
     domain=$(echo "$domain" |sed -e "s/\.$//")
 fi
 
-domain=$(idn -t --quiet -u "$domain" )
+domain=$domain
 domain_idn=$(idn -t --quiet -a "$domain")
 
 # Includes

+ 1 - 1
bin/v-delete-dns-domain

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

+ 1 - 1
bin/v-delete-mail-domain-dkim

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

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

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

+ 1 - 1
bin/v-search-domain-owner

@@ -10,7 +10,7 @@
 #----------------------------------------------------------#
 
 # Argument definition
-domain=$(idn -t --quiet -u "$1" )
+domain=$1
 type=${2-any}
 
 # Includes