github/myvesta
1
0
Fork 0
mirror of https://github.com/myvesta/vesta synced 2025-08-20 05:14:10 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed domain_idn bug

Browse source
This commit is contained in:
Serghey Rodin 2011-08-10 23:52:30 +03:00
commit 2ffc02e6a7
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
bin/v_del_web_domain_alias
View file

@ -8,6 +8,7 @@
# Argument defenition # Argument defenition
user="$1" user="$1"
domain=$(idn -t --quiet -u "$2" ) domain=$(idn -t --quiet -u "$2" )
domain_idn=$(idn -t --quiet -a "$domain" )
dom_alias=$(idn -t --quiet -u "$3" ) dom_alias=$(idn -t --quiet -u "$3" )
dom_alias_idn=$(idn -t --quiet -a "$dom_alias" ) dom_alias_idn=$(idn -t --quiet -a "$dom_alias" )
@ -44,14 +45,13 @@ is_domain_suspended 'web_domains'
# Checking alias is added # Checking alias is added
cur_alias=$(get_web_domain_value '$ALIAS') cur_alias=$(get_web_domain_value '$ALIAS')
check_alias=$(echo $cur_alias|grep -w "$dom_alias") check_alias=$(echo ${cur_alias//,/ }|grep -w "$dom_alias")
if [ -z "$check_alias" ]; then if [ -z "$check_alias" ]; then
echo "Error: alias not exist" echo "Error: alias not exist"
log_event 'debug' "$E_DOM_NOTEXIST $V_EVENT" log_event 'debug' "$E_DOM_NOTEXIST $V_EVENT"
exit $E_DOM_NOTEXIST exit $E_DOM_NOTEXIST
fi fi
#----------------------------------------------------------# #----------------------------------------------------------#
# Action # # Action #
#----------------------------------------------------------# #----------------------------------------------------------#