From 48cf929e22a30dec90b6ab6c7440657f10d60cc5 Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Tue, 28 Jun 2016 15:38:11 +0300 Subject: [PATCH] domain idn handler --- bin/v-add-dns-record | 5 +++++ bin/v-change-dns-record | 7 +++++-- bin/v-suspend-dns-record | 8 ++++++-- bin/v-unsuspend-dns-record | 8 ++++++-- 4 files changed, 22 insertions(+), 6 deletions(-) diff --git a/bin/v-add-dns-record b/bin/v-add-dns-record index f522f77d..113874d3 100755 --- a/bin/v-add-dns-record +++ b/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 diff --git a/bin/v-change-dns-record b/bin/v-change-dns-record index 9f5dfb08..505a8a1f 100755 --- a/bin/v-change-dns-record +++ b/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 diff --git a/bin/v-suspend-dns-record b/bin/v-suspend-dns-record index 811965f9..0e9afa37 100755 --- a/bin/v-suspend-dns-record +++ b/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 diff --git a/bin/v-unsuspend-dns-record b/bin/v-unsuspend-dns-record index 2f27a5ae..35b2d7b4 100755 --- a/bin/v-unsuspend-dns-record +++ b/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