Bugfix: Removing web domain did not remove php-fpm pool config file

Author: Lupul

bin/v-delete-web-domain-backend

@@ -46,7 +46,7 @@ check_hestia_demo_mode
 #----------------------------------------------------------#
 
 # Defining pool directory
-pool=$(find -L /etc/php* -type d \( -name "pool.d" -o -name "*fpm.d" \))
+pool=$(find -L /etc/php/ -name "$domain.conf" -exec dirname {} \;)
 if [ ! -e "$pool" ]; then
     check_result $E_NOTEXIST "php-fpm pool doesn't exist"
 fi

bin/v-list-user

@@ -156,6 +156,7 @@ csv_list() {
 #----------------------------------------------------------#
 
 check_args '1' "$#" 'USER [FORMAT]'
+is_format_valid 'user'
 is_object_valid 'user' 'USER' "$user"
 
 

func/domain.sh

@@ -91,8 +91,8 @@ prepare_web_backend() {
         backend_version="${BASH_REMATCH[1]}.${BASH_REMATCH[2]}"
         pool=$(find -L /etc/php/$backend_version -type d \( -name "pool.d" -o -name "*fpm.d" \))
     else
+        backend_version=$(php -r "echo (float)phpversion();")
         if [ -z "$pool" ] || [ -z "$BACKEND" ]; then 
-            backend_version=$(php -r "echo (float)phpversion();")
             pool=$(find -L /etc/php/$backend_version -type d \( -name "pool.d" -o -name "*fpm.d" \))
         fi
     fi

func/main.sh

@@ -231,7 +231,8 @@ is_object_new() {
 # Check if object is valid
 is_object_valid() {
     if [ $2 = 'USER' ]; then
-        if [ ! -d "$HESTIA/data/users/$3" ]; then
+        tstpath="$(readlink -f "$HESTIA/data/users/$3")"
+        if [ "$(dirname "$tstpath")" != "$(readlink -f "$HESTIA/data/users")" ] || [ ! -d "$HESTIA/data/users/$3" ]; then
             check_result $E_NOTEXIST "$1 $3 doesn't exist"
         fi
     else