refactoring: log_event(), is_format_valid()

This commit is contained in:
Serghey Rodin 2016-06-24 16:31:43 +03:00
commit a61a6e979e
52 changed files with 582 additions and 1170 deletions

View file

@ -11,9 +11,8 @@
# Argument definition
user=$1
domain=$(idn -t --quiet -u "$2" )
domain_idn=$(idn -t --quiet -a "$domain")
new_domain=$(echo $3 |tr '[:upper:]' '[:lower:]')
domain=$2
ip=$3
restart=$4
# Includes
@ -34,8 +33,7 @@ is_object_valid 'user' 'USER' "$user"
is_object_unsuspended 'user' 'USER' "$user"
is_object_valid 'web' 'DOMAIN' "$domain"
is_object_unsuspended 'web' 'DOMAIN' "$domain"
is_ip_valid
is_ip_avalable
is_ip_valid "$ip" "$user"
#----------------------------------------------------------#
@ -46,6 +44,12 @@ is_ip_avalable
get_domain_values 'web'
old=$(get_real_ip $IP)
new=$ip
if [[ "$domain" = *[![:ascii:]]* ]]; then
domain_idn=$(idn -t --quiet -a $domain)
else
domain_idn=$domain
fi
# Replacing vhost
replace_web_config "$WEB_SYSTEM" "$TPL.tpl"