Serghey Rodin 9 лет назад
Родитель
Сommit
48cf929e22
4 измененных файлов с 22 добавлено и 6 удалено
  1. 5 0
      bin/v-add-dns-record
  2. 5 2
      bin/v-change-dns-record
  3. 6 2
      bin/v-suspend-dns-record
  4. 6 2
      bin/v-unsuspend-dns-record

+ 5 - 0
bin/v-add-dns-record

@@ -26,6 +26,11 @@ if [ -z "$priority" ]; then
     priority=10
 fi
 
+domain_idn="$domain"
+if [[ "$domain" = *[![:ascii:]]* ]]; then
+    domain_idn=$(idn -t --quiet -a $domain)
+fi
+
 # Includes
 source $VESTA/func/main.sh
 source $VESTA/func/domain.sh

+ 5 - 2
bin/v-change-dns-record

@@ -12,13 +12,16 @@
 # Argument definition
 user=$1
 domain=$(idn -t --quiet -u "$2" )
-domain=$(echo $domain | tr '[:upper:]' '[:lower:]')
-domain_idn=$(idn -t --quiet -a "$domain")
 id=$3
 dvalue=$(idn -t --quiet -u "$4" )
 priority=$5
 restart=$6
 
+domain_idn="$domain"
+if [[ "$domain" = *[![:ascii:]]* ]]; then
+    domain_idn=$(idn -t --quiet -a $domain)
+fi
+
 # Includes
 source $VESTA/func/main.sh
 source $VESTA/func/domain.sh

+ 6 - 2
bin/v-suspend-dns-record

@@ -11,11 +11,15 @@
 
 # Argument definition
 user=$1
-domain=$(idn -t --quiet -u "$2" )
-domain_idn=$(idn -t --quiet -a "$domain")
+domain="$2"
 id=$3
 restart="$4"
 
+domain_idn="$domain"
+if [[ "$domain" = *[![:ascii:]]* ]]; then
+    domain_idn=$(idn -t --quiet -a $domain)
+fi
+
 # Includes
 source $VESTA/func/main.sh
 source $VESTA/func/domain.sh

+ 6 - 2
bin/v-unsuspend-dns-record

@@ -11,11 +11,15 @@
 
 # Argument definition
 user=$1
-domain=$(idn -t --quiet -u "$2" )
-domain_idn=$(idn -t --quiet -a "$domain")
+domain=$2
 id=$3
 restart="$4"
 
+domain_idn="$domain"
+if [[ "$domain" = *[![:ascii:]]* ]]; then
+    domain_idn=$(idn -t --quiet -a $domain)
+fi
+
 # Includes
 source $VESTA/func/main.sh
 source $VESTA/func/domain.sh