diff --git a/bin/v_add_dns_domain b/bin/v_add_dns_domain index 08d65d2d..ace2fa4e 100755 --- a/bin/v_add_dns_domain +++ b/bin/v_add_dns_domain @@ -16,6 +16,7 @@ # Argument defenition user=$1 domain=$(idn -t --quiet -u "$2" ) +domain=$(echo $domain | sed -e 's/\.*$//g' -e 's/^\.*//g') domain=$(echo $domain | tr '[:upper:]' '[:lower:]') domain_idn=$(idn -t --quiet -a "$domain") ip=$3 diff --git a/bin/v_add_dns_on_web_alias b/bin/v_add_dns_on_web_alias index b7eff6de..ccefb256 100755 --- a/bin/v_add_dns_on_web_alias +++ b/bin/v_add_dns_on_web_alias @@ -11,7 +11,7 @@ # Argument defenition user=$1 -domain=$(idn -t --quiet -u "$2" ) +domain=$(echo $domain | sed -e 's/\.*$//g' -e 's/^\.*//g') domain_idn=$(idn -t --quiet -a "$domain") # Includes diff --git a/bin/v_add_mail_domain b/bin/v_add_mail_domain index a0919b3a..c40a68ef 100755 --- a/bin/v_add_mail_domain +++ b/bin/v_add_mail_domain @@ -12,6 +12,7 @@ # Argument defenition user=$1 domain=$(idn -t --quiet -u "$2" ) +domain=$(echo $domain | sed -e 's/\.*$//g' -e 's/^\.*//g') domain=$(echo $domain | tr '[:upper:]' '[:lower:]') domain_idn=$(idn -t --quiet -a "$domain") antispam=${3-yes} diff --git a/bin/v_add_web_domain b/bin/v_add_web_domain index d6dd98df..80c634fa 100755 --- a/bin/v_add_web_domain +++ b/bin/v_add_web_domain @@ -17,6 +17,7 @@ # Argument defenition user=$1 domain=$(idn -t --quiet -u "$2" ) +domain=$(echo $domain | sed -e 's/\.*$//g' -e 's/^\.*//g') domain=$(echo $domain | tr '[:upper:]' '[:lower:]') domain_idn=$(idn -t --quiet -a "$domain") ip=$3 diff --git a/bin/v_add_web_domain_alias b/bin/v_add_web_domain_alias index a778416f..3d13e708 100755 --- a/bin/v_add_web_domain_alias +++ b/bin/v_add_web_domain_alias @@ -16,6 +16,7 @@ domain=$(idn -t --quiet -u "$2" ) domain=$(echo $domain | tr '[:upper:]' '[:lower:]') domain_idn=$(idn -t --quiet -a "$domain") dom_alias=$(idn -t --quiet -u "$3" ) +dom_alias=$(echo $dom_alias | sed -e 's/\.*$//g' -e 's/^\.*//g') dom_alias=$(echo $dom_alias | tr '[:upper:]' '[:lower:]') dom_alias_idn=$(idn -t --quiet -a "$dom_alias" ) restart="$4" diff --git a/bin/v_change_dns_domain_soa b/bin/v_change_dns_domain_soa index 9de87867..2851756e 100755 --- a/bin/v_change_dns_domain_soa +++ b/bin/v_change_dns_domain_soa @@ -14,7 +14,7 @@ user=$1 domain=$(idn -t --quiet -u "$2" ) domain_idn=$(idn -t --quiet -a "$domain") -soa=$3 +soa=$(echo $3 | sed -e 's/\.*$//g' -e 's/^\.*//g') # Includes source $VESTA/conf/vesta.conf diff --git a/bin/v_change_user_ns b/bin/v_change_user_ns index d8790435..91232140 100755 --- a/bin/v_change_user_ns +++ b/bin/v_change_user_ns @@ -11,8 +11,8 @@ # Argument defenition user=$1 -ns1=$2 -ns2=$3 +ns1=$(echo $2 | sed -e 's/\.*$//g' -e 's/^\.*//g') +ns2=$(echo $3 | sed -e 's/\.*$//g' -e 's/^\.*//g') ns3=$4 ns4=$5 ns5=$6 @@ -35,21 +35,27 @@ check_args '3' "$#" 'user ns1 ns2 [ns3] [ns4] [ns5] [ns6] [ns7] [ns8]' # Checking argument format validate_format 'user' 'ns1' 'ns2' if [ ! -z "$ns3" ]; then + ns3=$(echo $4 | sed -e 's/\.*$//g' -e 's/^\.*//g') validate_format 'ns3' fi if [ ! -z "$ns4" ]; then + ns4=$(echo $5 | sed -e 's/\.*$//g' -e 's/^\.*//g') validate_format 'ns4' fi if [ ! -z "$ns5" ]; then + ns5=$(echo $6 | sed -e 's/\.*$//g' -e 's/^\.*//g') validate_format 'ns5' fi if [ ! -z "$ns6" ]; then + ns6=$(echo $7 | sed -e 's/\.*$//g' -e 's/^\.*//g') validate_format 'ns6' fi if [ ! -z "$ns7" ]; then + ns7=$(echo $8 | sed -e 's/\.*$//g' -e 's/^\.*//g') validate_format 'ns7' fi if [ ! -z "$ns8" ]; then + ns8=$(echo $9 | sed -e 's/\.*$//g' -e 's/^\.*//g') validate_format 'ns8' fi