From 0c30b54f92d1f7e46ecbdf9675bc766a35b6f15f Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Thu, 30 Jun 2011 01:00:27 +0300 Subject: [PATCH] domain_idn argument defenition --- bin/v_add_web_domain_nginx | 3 ++- bin/v_change_web_domain_ip | 3 ++- bin/v_change_web_domain_sslhome | 3 ++- bin/v_get_dns_domain_value | 3 ++- bin/v_get_web_domain_value | 3 ++- bin/v_list_dns_domain | 3 ++- bin/v_list_web_domain | 3 ++- bin/v_suspend_dns_domain | 3 ++- bin/v_suspend_web_domain | 3 ++- bin/v_unsuspend_dns_domain | 3 ++- bin/v_unsuspend_web_domain | 3 ++- bin/v_upd_web_domain_disk | 3 ++- bin/v_upd_web_domain_traff | 3 ++- 13 files changed, 26 insertions(+), 13 deletions(-) diff --git a/bin/v_add_web_domain_nginx b/bin/v_add_web_domain_nginx index 4c53acd5..588f603a 100755 --- a/bin/v_add_web_domain_nginx +++ b/bin/v_add_web_domain_nginx @@ -7,7 +7,8 @@ # Argument defenition user="$1" -domain="$2" +domain=$(idn -t --quiet -u "$2" ) +domain_idn=$(idn -t --quiet -a "$domain") template="${3-default}" default_extentions="jpg,jpeg,gif,png,ico,css,zip,tgz,gz,rar,bz2,doc,xls,exe,\ pdf,ppt,txt,tar,wav,bmp,rtf,js,mp3,avi,mpeg" diff --git a/bin/v_change_web_domain_ip b/bin/v_change_web_domain_ip index fe025b2d..3f297398 100755 --- a/bin/v_change_web_domain_ip +++ b/bin/v_change_web_domain_ip @@ -7,7 +7,8 @@ # Argument defenition user="$1" -domain="$2" +domain=$(idn -t --quiet -u "$2" ) +domain_idn=$(idn -t --quiet -a "$domain") ip="$3" # Importing variables diff --git a/bin/v_change_web_domain_sslhome b/bin/v_change_web_domain_sslhome index 212c5052..a5b3dce4 100755 --- a/bin/v_change_web_domain_sslhome +++ b/bin/v_change_web_domain_sslhome @@ -7,7 +7,8 @@ # Argument defenition user="$1" -domain="$2" +domain=$(idn -t --quiet -u "$2" ) +domain_idn=$(idn -t --quiet -a "$domain") tpl_option="$3" # Importing variables diff --git a/bin/v_get_dns_domain_value b/bin/v_get_dns_domain_value index 7c1c0cac..6772f1bc 100755 --- a/bin/v_get_dns_domain_value +++ b/bin/v_get_dns_domain_value @@ -7,7 +7,8 @@ # Argument defenition user="$1" -domain="$2" +domain=$(idn -t --quiet -u "$2" ) +domain_idn=$(idn -t --quiet -a "$domain") key=$(echo "$3"| tr '[:lower:]' '[:upper:]'|sed -e "s/^/$/") # Importing variables diff --git a/bin/v_get_web_domain_value b/bin/v_get_web_domain_value index 03216638..ccecc1da 100755 --- a/bin/v_get_web_domain_value +++ b/bin/v_get_web_domain_value @@ -7,7 +7,8 @@ # Argument defenition user="$1" -domain="$2" +domain=$(idn -t --quiet -u "$2" ) +domain_idn=$(idn -t --quiet -a "$domain") key=$(echo "$3"| tr '[:lower:]' '[:upper:]'|sed -e "s/^/$/") # Importing variables diff --git a/bin/v_list_dns_domain b/bin/v_list_dns_domain index 648b167c..fc9f0666 100755 --- a/bin/v_list_dns_domain +++ b/bin/v_list_dns_domain @@ -7,7 +7,8 @@ # Argument defenition user="$1" -domain="$2" +domain=$(idn -t --quiet -u "$2" ) +domain_idn=$(idn -t --quiet -a "$domain") format="${3-shell}" limit="${4-1000}" offset="${5-1}" diff --git a/bin/v_list_web_domain b/bin/v_list_web_domain index 4fb1415d..51ff4e14 100755 --- a/bin/v_list_web_domain +++ b/bin/v_list_web_domain @@ -7,7 +7,8 @@ # Argument defenition user="$1" -domain="$2" +domain=$(idn -t --quiet -u "$2" ) +domain_idn=$(idn -t --quiet -a "$domain") format="${3-shell}" # Importing variables diff --git a/bin/v_suspend_dns_domain b/bin/v_suspend_dns_domain index 2d36a3fc..b977f3ca 100755 --- a/bin/v_suspend_dns_domain +++ b/bin/v_suspend_dns_domain @@ -7,7 +7,8 @@ # Argument defenition user="$1" -domain="$2" +domain=$(idn -t --quiet -u "$2" ) +domain_idn=$(idn -t --quiet -a "$domain") # Importing variables source $VESTA/conf/vars.conf diff --git a/bin/v_suspend_web_domain b/bin/v_suspend_web_domain index 06f7b8ca..326ad9ea 100755 --- a/bin/v_suspend_web_domain +++ b/bin/v_suspend_web_domain @@ -7,7 +7,8 @@ # Argument defenition user="$1" -domain="$2" +domain=$(idn -t --quiet -u "$2" ) +domain_idn=$(idn -t --quiet -a "$domain") # Importing variables source $VESTA/conf/vars.conf diff --git a/bin/v_unsuspend_dns_domain b/bin/v_unsuspend_dns_domain index 0bfb0ba6..58e6e4da 100755 --- a/bin/v_unsuspend_dns_domain +++ b/bin/v_unsuspend_dns_domain @@ -7,7 +7,8 @@ # Argument defenition user="$1" -domain="$2" +domain=$(idn -t --quiet -u "$2" ) +domain_idn=$(idn -t --quiet -a "$domain") # Importing variables source $VESTA/conf/vars.conf diff --git a/bin/v_unsuspend_web_domain b/bin/v_unsuspend_web_domain index aa8e4147..93f44c57 100755 --- a/bin/v_unsuspend_web_domain +++ b/bin/v_unsuspend_web_domain @@ -7,7 +7,8 @@ # Argument defenition user="$1" -domain="$2" +domain=$(idn -t --quiet -u "$2" ) +domain_idn=$(idn -t --quiet -a "$domain") # Importing variables source $VESTA/conf/vars.conf diff --git a/bin/v_upd_web_domain_disk b/bin/v_upd_web_domain_disk index 7e93f1ce..7d8b43eb 100755 --- a/bin/v_upd_web_domain_disk +++ b/bin/v_upd_web_domain_disk @@ -7,7 +7,8 @@ # Argument defenition user="$1" -domain="$2" +domain=$(idn -t --quiet -u "$2" ) +domain_idn=$(idn -t --quiet -a "$domain") # Importing variables source $VESTA/conf/vars.conf diff --git a/bin/v_upd_web_domain_traff b/bin/v_upd_web_domain_traff index f4f3b393..3e491a64 100755 --- a/bin/v_upd_web_domain_traff +++ b/bin/v_upd_web_domain_traff @@ -7,7 +7,8 @@ # Argument defenition user="$1" -domain="$2" +domain=$(idn -t --quiet -u "$2" ) +domain_idn=$(idn -t --quiet -a "$domain") # Importing variables source $VESTA/conf/vars.conf