IPV6: Bugfixing Add/Change Web Domain

Using  instead of

bin/v-add-web-domain

@@ -177,9 +177,17 @@ else
 		ALIAS="$aliases"
 	fi
 
-	ip_alias=$(get_ip_alias "$domain")
-	if [ -n "$ip_alias" ]; then
-		ALIAS="$ALIAS,$ip_alias"
+	if [ -n "$local_ip" ]; then
+		ip_alias=$(get_ip_alias "$domain")
+		if [ -n "$ip_alias" ]; then
+			ALIAS="$ALIAS,$ip_alias"
+		fi
+	fi
+	if [ -n "$local_ipv6" ]; then
+		ipv6_alias=$(get_ipv6_alias "$domain")
+		if [ -n "$ipv6_alias" ]; then
+			ALIAS="$ALIAS,$ipv6_alias"
+		fi
 	fi
 fi
 
@@ -215,8 +223,8 @@ fi
 #----------------------------------------------------------#
 
 # Increasing counters
-[ -n "$ip" ] && increase_ip_value "$local_ip"
-[ -n "$ipv6" ] && increase_ipv6_value "$local_ipv6"
+[ -n "$local_ip" ] && increase_ip_value "$local_ip"
+[ -n "$local_ipv6" ] && increase_ipv6_value "$local_ipv6"
 increase_user_value "$user" '$U_WEB_DOMAINS'
 increase_user_value "$user" '$U_WEB_ALIASES' "$alias_number"
 

bin/v-add-web-domain-ssl

@@ -94,6 +94,7 @@ fi
 # Parsing domain values
 get_domain_values 'web'
 local_ip=$(get_real_ip "$IP")
+local_ipv6="$IP6"
 
 # Preparing domain values for the template substitution
 SSL_HOME="$ssl_home"

bin/v-change-web-domain-ip

@@ -60,7 +60,8 @@ check_hestia_demo_mode
 get_domain_values 'web'
 old=$(get_real_ip "$IP")
 new=$(get_real_ip "$ip")
-ipv6=$(get_real_ip "$IP6")
+ipv6="$IP6"
+local_ipv6="$ipv6"
 
 # Replacing vhost
 replace_web_config "$WEB_SYSTEM" "$TPL.tpl"

bin/v-delete-web-domain

@@ -56,6 +56,7 @@ check_hestia_demo_mode
 # Parsing domain values
 get_domain_values 'web'
 local_ip=$(get_real_ip "$IP")
+local_ipv6="$IP6"
 
 # Deleting ftp users
 if [ -n "$FTP_USER" ]; then
@@ -120,7 +121,8 @@ rm -rf $HOMEDIR/$user/conf/web/$domain
 #----------------------------------------------------------#
 
 # Decreasing user counters
-decrease_ip_value "$local_ip"
+[ -n "$local_ip" ] && decrease_ip_value "$local_ip"
+[ -n "$local_ipv6" ] && decrease_ipv6_value "$local_ipv6"
 decrease_user_value "$user" '$U_WEB_DOMAINS'
 if [ "$SSL" = 'yes' ]; then
 	decrease_user_value "$user" '$U_WEB_SSL'

func/domain.sh

@@ -249,15 +249,15 @@ add_web_config() {
 			WEBTPL_LOCATION="$WEBTPL/$1/$WEB_BACKEND"
 		fi
 	fi
-
-	if [ -z "$ip" ]; then
+	
+	if [ -z "$local_ip" ]; then
 		i4mark=""
 		ipv4=""
 		web_ipv4=""
-		web_ip="[$ipv6]"
+		web_ip="[$local_ipv6]"
 		proxy_ipv4=""
-		proxy_ip="[$ipv6]"
-		local_ip="[$ipv6]"
+		proxy_ip="[$local_ipv6]"
+		legacy_ip="[$local_ipv6]"
 	else
 		i4mark="\1"
 		ipv4="$local_ip"
@@ -265,8 +265,9 @@ add_web_config() {
 		web_ip="$local_ip"
 		proxy_ipv4="$local_ip"
 		proxy_ip="$local_ip"
+		legacy_ip="$local_ip"
 	fi
-	if [ -z "$ipv6" ]; then
+	if [ -z "$local_ipv6" ]; then
 		i6mark=""
 		web_ipv6=""
 		web_ip="$local_ip"
@@ -274,10 +275,10 @@ add_web_config() {
 		proxy_ip="$local_ip"
 	else
 		i6mark="\1"
-		web_ipv6="[$ipv6]"
-		web_ip="[$ipv6]"
-		proxy_ipv6="[$ipv6]"
-		proxy_ip="[$ipv6]"
+		web_ipv6="[$local_ipv6]"
+		web_ip="[$local_ipv6]"
+		proxy_ipv6="[$local_ipv6]"
+		proxy_ip="[$local_ipv6]"
 	fi
 	
 	# Note: Removing or renaming template variables will lead to broken custom templates.
@@ -293,7 +294,7 @@ add_web_config() {
 			-e "s|%proxy_ipv4%|$proxy_ipv4|g" \
 			-e "s|%proxy_ipv6%|$proxy_ipv6|g" \
 			-e "s|%proxy_ip%|$proxy_ip|g" \
-			-e "s|%ip%|$local_ip|g" \
+			-e "s|%ip%|$legacy_ip|g" \
 			-e "s|%domain%|$domain|g" \
 			-e "s|%domain_idn%|$domain_idn|g" \
 			-e "s|%alias%|${aliases//,/ }|g" \
@@ -324,7 +325,6 @@ add_web_config() {
 
 	chown root:$user $conf
 	chmod 640 $conf
-
 	if [[ "$2" =~ stpl$ ]]; then
 		rm -f /etc/$1/conf.d/domains/$domain.ssl.conf
 		ln -s $conf /etc/$1/conf.d/domains/$domain.ssl.conf

func/ip.sh

@@ -86,9 +86,13 @@ update_ip_value_new() {
 
 # Get ip name
 get_ip_alias() {
-	ip_name=$(grep "NAME=" $HESTIA/data/ips/$local_ip | cut -f 2 -d \')
-	if [ -n "$ip_name" ]; then
-		echo "${1//./-}.$ip_name"
+	if [ -n "$local_ip"]; then
+		ip_name=$(grep "NAME=" $HESTIA/data/ips/$local_ip | cut -f 2 -d \')
+		if [ -n "$ip_name" ]; then
+			echo "${1//./-}.$ip_name"
+		fi
+	else
+		ip_name=""
 	fi
 }
 
@@ -339,10 +343,14 @@ update_ipv6_value() {
 
 # Get ipv6 name
 get_ipv6_alias() {
-    ip_name=$(grep "NAME=" $HESTIA/data/ips/$ipv6 2> /dev/null |cut -f 2 -d \')
-    if [ ! -z "$ip_name" ]; then
-        echo "${1//./-}.$ip_name"
-    fi
+	if [ -n "$local_ipv6" ]; then
+		ipv6_name=$(grep "NAME=" $HESTIA/data/ips/$local_ipv6 2> /dev/null |cut -f 2 -d \')
+		if [ -n "$ipv6_name" ]; then
+			echo "${1//./-}.$ipv6_name"
+		fi
+	else
+		ipv6_name=""
+	fi
 }
 
 # Increase ipv6 value
@@ -415,7 +423,7 @@ decrease_ipv6_value() {
 # Get ipv6 address value
 get_ipv6_value() {
     key="$1"
-    string=$(cat $HESTIA/data/ips/$ip)
+    string=$(cat $HESTIA/data/ips/$ipv6)
     eval $string
     eval value="$key"
     echo "$value"
@@ -481,12 +489,13 @@ get_user_ip6s() {
 # Get user ipv6
 get_user_ipv6() {
     ipv6=$(get_user_ip6s |head -n1)
+	local_ipv6="$ipv6"
 }
 
 # Validate ipv6 address
 is_ipv6_valid() {
-    ipv6="$1"
-    if [ -z "$ipv6" ]; then
+    local_ipv6="$1"
+    if [ -z "$local_ipv6" ]; then
         check_result $E_NOTEXIST "IPV6 address is empty"
     fi
     if [ ! -e "$HESTIA/data/ips/$1" ]; then