From b4775368cb78d511dab2d09ff65e50f43aea9244 Mon Sep 17 00:00:00 2001
From: Serghey Rodin <serghey.rodin@gmail.com>
Date: Wed, 29 Feb 2012 15:18:01 +0200
Subject: [PATCH] optimized domain function usage

---
 bin/v_delete_dns_domain | 13 ++++++++-----
 bin/v_delete_web_domain |  2 +-
 func/domain.func        | 30 +-----------------------------
 3 files changed, 10 insertions(+), 35 deletions(-)

diff --git a/bin/v_delete_dns_domain b/bin/v_delete_dns_domain
index 5c1ad1991..625595780 100755
--- a/bin/v_delete_dns_domain
+++ b/bin/v_delete_dns_domain
@@ -1,5 +1,5 @@
 #!/bin/bash
-# info: delite dns domain
+# info: delete dns domain
 # options: user domain
 #
 # The function for deleting DNS domain. By deleting it all records will also be
@@ -49,9 +49,10 @@ is_domain_valid 'dns'
 #                       Action                             #
 #----------------------------------------------------------#
 
-# Get template name
+# Get domain values
 tpl_name=$(get_domain_value 'dns' '$TPL')
 old_ip=$(get_domain_value 'dns' '$IP')
+records=$(wc -l $V_USERS/$user/dns/$domain|cut -f 1 -d ' ')
 
 # Deleting domain in named.conf
 rm_string=$(grep -n /conf/dns/$domain.db $named_conf |cut -d : -f 1)
@@ -68,11 +69,13 @@ fi
 #                       Vesta                              #
 #----------------------------------------------------------#
 
+# Deleting domain
+sed -i "/DOMAIN='$domain'/ d" $V_USERS/$user/dns.conf
+rm -f $V_USERS/$user/dns/$domain
+
 # Decreasing domain value
 decrease_user_value "$user" '$U_DNS_DOMAINS'
-
-# Deleting domain
-del_dns_domain
+decrease_user_value "$user" '$U_DNS_RECORDS' "$records"
 
 # Adding task to the vesta pipe
 restart_schedule 'dns'
diff --git a/bin/v_delete_web_domain b/bin/v_delete_web_domain
index 80a6870e7..4f49dd255 100755
--- a/bin/v_delete_web_domain
+++ b/bin/v_delete_web_domain
@@ -115,7 +115,7 @@ rm -f /var/log/httpd/domains/$domain.error*
 #----------------------------------------------------------#
 
 # Deleting domain
-del_web_domain
+sed -i "/DOMAIN='$domain'/ d" $V_USERS/$user/web.conf
 
 # Checking last ssl domain
 ssl_dom=$(grep "SSL='yes'" $V_USERS/$user/web.conf | wc -l)
diff --git a/func/domain.func b/func/domain.func
index 458abc740..f72603aae 100644
--- a/func/domain.func
+++ b/func/domain.func
@@ -40,7 +40,7 @@ is_domain_suspended() {
 
     # Checking result
     if [ ! -z "$check_domain" ]; then
-        echo "Error: domain suspended"
+        echo "Error: domain $domain is suspended"
         log_event 'debug' "$E_SUSPENDED $V_EVENT"
         exit $E_SUSPENDED
     fi
@@ -409,34 +409,6 @@ del_web_config() {
     sed -i "$top_line,$bottom_line d" $conf
 }
 
-del_dns_domain() {
-    conf="$V_USERS/$user/dns.conf"
-
-    # Parsing domains
-    string=$( grep -n "DOMAIN='$domain'" $conf | cut -f 1 -d : )
-    if [ -z "$string" ]; then
-        echo "Error: parse error"
-        log_event 'debug' "$E_PARSING $V_EVENT"
-        exit $E_PARSING
-    fi
-    sed -i "$string d" $conf
-    rm -f $V_USERS/$user/dns/$domain
-}
-
-del_web_domain() {
-    conf="$V_USERS/$user/web.conf"
-
-    # Parsing domains
-    string=$( grep -n "DOMAIN='$domain'" $conf | cut -f 1 -d : )
-    if [ -z "$string" ]; then
-        echo "Error: parse error"
-        log_event 'debug' "$E_PARSING $V_EVENT"
-        exit $E_PARSING
-    fi
-    sed -i "$string d" $conf
-}
-
-
 dom_clear_search(){
     # Defining delimeter
     IFS=$'\n'