From 3a09991f0a68c459e3599202737ad99f3556b1eb Mon Sep 17 00:00:00 2001
From: Serghey Rodin <serghey.rodin@gmail.com>
Date: Mon, 20 Feb 2012 13:47:30 +0200
Subject: [PATCH] Added web tab triggers. Issue #50

---
 bin/v_add_web_domain          |  1 +
 bin/v_add_web_domain_alias    |  3 +++
 bin/v_delete_web_domain       | 15 +++++++++++++++
 bin/v_delete_web_domain_alias |  3 +++
 bin/v_list_web_domains_alias  |  2 +-
 bin/v_suspend_web_domain      |  1 +
 bin/v_unsuspend_web_domain    |  3 ++-
 func/shared.func              |  6 ++++--
 8 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/bin/v_add_web_domain b/bin/v_add_web_domain
index 9a2445cb5..34296b193 100755
--- a/bin/v_add_web_domain
+++ b/bin/v_add_web_domain
@@ -207,6 +207,7 @@ increase_ip_value "$ip"
 
 # Increasing domain value
 increase_user_value "$user" '$U_WEB_DOMAINS'
+increase_user_value "$user" '$U_WEB_ALIASES'
 
 # Defining domain variables
 v_str="DOMAIN='$domain'"
diff --git a/bin/v_add_web_domain_alias b/bin/v_add_web_domain_alias
index d672ff1ae..79644eacf 100755
--- a/bin/v_add_web_domain_alias
+++ b/bin/v_add_web_domain_alias
@@ -120,6 +120,9 @@ fi
 # Adding new alias
 update_web_domain_value '$ALIAS' "$ALIAS"
 
+# Update counters
+increase_user_value "$user" '$U_WEB_ALIASES'
+
 # Adding task to the vesta pipe
 restart_schedule 'web'
 
diff --git a/bin/v_delete_web_domain b/bin/v_delete_web_domain
index 7be70e67f..1df271796 100755
--- a/bin/v_delete_web_domain
+++ b/bin/v_delete_web_domain
@@ -63,6 +63,13 @@ conf="$V_HOME/$user/conf/web/httpd.conf"
 # Deleting domain
 del_web_config
 
+# Checking aliases
+if [ ! -z "$ALIAS" ]; then
+    aliases=$(echo $ALIAS | tr ',' '\n' | wc -l )
+else
+    aliases=0
+fi
+
 # Checking ssl
 if [ "$SSL" = 'yes' ]; then
     tpl_file="$V_WEBTPL/apache_$TPL.stpl"
@@ -152,6 +159,14 @@ decrease_ip_value "$IP"
 # Decreasing domain value
 decrease_user_value "$user" '$U_WEB_DOMAINS'
 
+# Decreasing web aliases
+decrease_user_value "$user" '$U_WEB_ALIASES' "$aliases"
+
+# Decreasing web ssl
+if [ "$SSL" = 'yes' ]; then
+    decrease_user_value "$user" '$U_WEB_SSL'
+fi
+
 # Adding task to the vesta pipe
 restart_schedule 'web'
 
diff --git a/bin/v_delete_web_domain_alias b/bin/v_delete_web_domain_alias
index b17633c05..6f1489e92 100755
--- a/bin/v_delete_web_domain_alias
+++ b/bin/v_delete_web_domain_alias
@@ -109,6 +109,9 @@ fi
 # Deleting alias
 update_web_domain_value '$ALIAS' "$ALIAS"
 
+# Update counters
+decrease_user_value "$user" '$U_WEB_ALIASES'
+
 # Adding task to the vesta pipe
 restart_schedule 'web'
 
diff --git a/bin/v_list_web_domains_alias b/bin/v_list_web_domains_alias
index 8e5513227..112da7b37 100755
--- a/bin/v_list_web_domains_alias
+++ b/bin/v_list_web_domains_alias
@@ -48,7 +48,7 @@ fields="\$DOMAIN \$ALIAS"
 case $format in 
     json)   json_list ;;
     plain)  nohead=1; shell_list ;;
-    shell)  shell_list | column -t ;;
+    shell)  shell_list;;
     *)      check_args '1' '0' 'user [format]'
 esac
 
diff --git a/bin/v_suspend_web_domain b/bin/v_suspend_web_domain
index 8ae1b9e02..ad9c285f7 100755
--- a/bin/v_suspend_web_domain
+++ b/bin/v_suspend_web_domain
@@ -97,6 +97,7 @@ fi
 
 # Adding suspend in config
 update_web_domain_value '$SUSPENDED' 'yes'
+increase_user_value "$user" '$SUSPENDED_WEB'
 
 # Adding task to the vesta pipe
 restart_schedule 'web'
diff --git a/bin/v_unsuspend_web_domain b/bin/v_unsuspend_web_domain
index c7e9287bb..63fc85474 100755
--- a/bin/v_unsuspend_web_domain
+++ b/bin/v_unsuspend_web_domain
@@ -90,8 +90,9 @@ fi
 #                       Vesta                              #
 #----------------------------------------------------------#
 
-# Adding suspend in config
+# Updating suspend keys
 update_web_domain_value '$SUSPENDED' 'no'
+decrease_user_value "$user" '$SUSPENDED_WEB'
 
 # Adding task to the vesta pipe
 restart_schedule 'web'
diff --git a/func/shared.func b/func/shared.func
index db55be4ca..fe863ce7e 100644
--- a/func/shared.func
+++ b/func/shared.func
@@ -692,6 +692,7 @@ update_user_value() {
 increase_user_value() {
     USER="$1"
     key="${2//$}"
+    factor="${3-1}"
 
     # Parsing current value
     conf="$V_USERS/$USER/user.conf"
@@ -701,7 +702,7 @@ increase_user_value() {
     fi
 
     # Increasing
-    new=$((old + 1 ))
+    new=$((old + factor))
     sed -i "s/$key='$old'/$key='$new'/g" $conf
 }
 
@@ -731,6 +732,7 @@ is_type_valid() {
 decrease_user_value() {
     USER="$1"
     key="${2//$}"
+    factor="${3-1}"
 
     # Parsing current value
     conf="$V_USERS/$USER/user.conf"
@@ -743,7 +745,7 @@ decrease_user_value() {
     if [ "$old" -le 1 ]; then
         new=0
     else
-        new=$((old - 1 ))
+        new=$((old - factor))
     fi
     sed -i "s/$key='$old'/$key='$new'/g" $conf
 }