Bugfix: removing web domains didn't also remove sftp accounts

Author: Lupul

bin/v-delete-web-domain

@@ -50,15 +50,22 @@ check_hestia_demo_mode
 #                       Action                             #
 #----------------------------------------------------------#
 
+# Parsing domain values
+get_domain_values 'web'
+local_ip=$(get_real_ip $IP)
+
+# Deleting ftp users
+if [ ! -z "$FTP_USER" ]; then
+    for ftp_user in ${FTP_USER//:/ }; do
+        $BIN/v-delete-web-domain-ftp "$user" "$domain" "$ftp_user"
+    done
+fi
+
 # Deleting web backend
 if [ ! -z "$WEB_BACKEND" ]; then
     $BIN/v-delete-web-domain-backend $user $domain $restart
 fi
 
-# Parsing domain values
-get_domain_values 'web'
-local_ip=$(get_real_ip $IP)
-
 # Deleting domain from web.conf
 sed -i "/DOMAIN='$domain'/ d" $USER_DATA/web.conf
 
@@ -91,17 +98,6 @@ if [ ! -z "$STATS" ] && [ "$STATS" != 'no' ]; then
     rm -f /etc/awstats/$STATS.$domain.conf
 fi
 
-# Deleting ftp users
-if [ ! -z "$FTP_USER" ]; then
-    for ftp_user in ${FTP_USER//:/ }; do
-        /usr/sbin/userdel $ftp_user >> /dev/null 2>&1
-        if [ "$?" != 0 ]; then
-            sed -i "/^$ftp_user:/d" /etc/passwd
-            sed -i "/^$ftp_user:/d" /etc/shadow
-        fi
-    done
-fi
-
 # Deleting logs
 rm -f /var/log/$WEB_SYSTEM/domains/$domain.log*
 rm -f /var/log/$WEB_SYSTEM/domains/$domain.bytes